From d6805d0d1d21976cf16d0237d9091f7eebea4ea5 Mon Sep 17 00:00:00 2001 From: mkwst Date: Thu, 16 Oct 2014 07:44:37 -0700 Subject: [PATCH] Content Shell: Move shell_layout_tests_android into layout_tests/. BUG=420994 Review URL: https://codereview.chromium.org/661743002 Cr-Commit-Position: refs/heads/master@{#299892} --- content/content_shell.gypi | 4 ++-- content/shell/BUILD.gn | 4 ++-- .../layout_test_android.cc} | 4 +--- .../layout_test_android.h} | 6 +++--- content/shell/browser/layout_test/layout_test_browser_main.cc | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) rename content/shell/browser/{shell_layout_tests_android.cc => layout_test/layout_test_android.cc} (95%) rename content/shell/browser/{shell_layout_tests_android.h => layout_test/layout_test_android.h} (78%) diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 37685ec2275e..880df5bf4bac 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -92,6 +92,8 @@ 'shell/app/webkit_test_platform_support_win.cc', 'shell/browser/ipc_echo_message_filter.cc', 'shell/browser/ipc_echo_message_filter.h', + 'shell/browser/layout_test/layout_test_android.cc', + 'shell/browser/layout_test/layout_test_android.h', 'shell/browser/layout_test/layout_test_browser_context.cc', 'shell/browser/layout_test/layout_test_browser_context.h', 'shell/browser/layout_test/layout_test_browser_main.cc', @@ -136,8 +138,6 @@ 'shell/browser/shell_javascript_dialog_manager.cc', 'shell/browser/shell_javascript_dialog_manager.h', 'shell/browser/shell_javascript_dialog_win.cc', - 'shell/browser/shell_layout_tests_android.cc', - 'shell/browser/shell_layout_tests_android.h', 'shell/browser/shell_mojo_test_utils_android.cc', 'shell/browser/shell_mojo_test_utils_android.h', 'shell/browser/shell_login_dialog.cc', diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index aa6685a4cb0c..08b2f6671d34 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn @@ -41,6 +41,8 @@ static_library("content_shell_lib") { "app/webkit_test_platform_support_win.cc", "browser/ipc_echo_message_filter.cc", "browser/ipc_echo_message_filter.h", + "browser/layout_test/layout_test_android.cc", + "browser/layout_test/layout_test_android.h", "browser/layout_test/layout_test_browser_context.cc", "browser/layout_test/layout_test_browser_context.h", "browser/layout_test/layout_test_browser_main.cc", @@ -84,8 +86,6 @@ static_library("content_shell_lib") { "browser/shell_javascript_dialog_manager.cc", "browser/shell_javascript_dialog_manager.h", "browser/shell_javascript_dialog_win.cc", - "browser/shell_layout_tests_android.cc", - "browser/shell_layout_tests_android.h", "browser/shell_mojo_test_utils_android.cc", "browser/shell_mojo_test_utils_android.h", "browser/shell_login_dialog.cc", diff --git a/content/shell/browser/shell_layout_tests_android.cc b/content/shell/browser/layout_test/layout_test_android.cc similarity index 95% rename from content/shell/browser/shell_layout_tests_android.cc rename to content/shell/browser/layout_test/layout_test_android.cc index 5047bb613c70..c981d84fb3ce 100644 --- a/content/shell/browser/shell_layout_tests_android.cc +++ b/content/shell/browser/layout_test/layout_test_android.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/browser/shell_layout_tests_android.h" +#include "content/shell/browser/layout_test/layout_test_android.h" #include "base/android/fifo_utils.h" #include "base/android/jni_android.h" @@ -57,8 +57,6 @@ bool GetTestUrlForAndroid(std::string& path_or_url, GURL* url) { } void EnsureInitializeForAndroidLayoutTests() { - CHECK(CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)); - JNIEnv* env = base::android::AttachCurrentThread(); content::NestedMessagePumpAndroid::RegisterJni(env); content::RegisterNativesImpl(env); diff --git a/content/shell/browser/shell_layout_tests_android.h b/content/shell/browser/layout_test/layout_test_android.h similarity index 78% rename from content/shell/browser/shell_layout_tests_android.h rename to content/shell/browser/layout_test/layout_test_android.h index 7410954b0670..29083fb0fc6c 100644 --- a/content/shell/browser/shell_layout_tests_android.h +++ b/content/shell/browser/layout_test/layout_test_android.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_BROWSER_SHELL_LAYOUT_TESTS_ANDROID_H_ -#define CONTENT_SHELL_BROWSER_SHELL_LAYOUT_TESTS_ANDROID_H_ +#ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_ANDROID_H_ +#define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_ANDROID_H_ #include @@ -22,4 +22,4 @@ void EnsureInitializeForAndroidLayoutTests(); } // namespace content -#endif // CONTENT_SHELL_BROWSER_SHELL_LAYOUT_TESTS_ANDROID_H_ +#endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_ANDROID_H_ diff --git a/content/shell/browser/layout_test/layout_test_browser_main.cc b/content/shell/browser/layout_test/layout_test_browser_main.cc index a1d78151908e..8d0cc6316d40 100644 --- a/content/shell/browser/layout_test/layout_test_browser_main.cc +++ b/content/shell/browser/layout_test/layout_test_browser_main.cc @@ -26,7 +26,7 @@ #if defined(OS_ANDROID) #include "base/run_loop.h" -#include "content/shell/browser/shell_layout_tests_android.h" +#include "content/shell/browser/layout_test/layout_test_android.h" #endif namespace { -- 2.11.4.GIT