Content Shell: Move shell_layout_tests_android into layout_tests/.

content/shell/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//tools/grit/repack.gni")
 import("//tools/grit/grit_rule.gni")
 if (is_android) {
   import("//build/config/android/config.gni")
@@ skipping 23 matching lines @@
     "app/shell_main_delegate.h",
     "app/shell_main_delegate_mac.h",
     "app/shell_main_delegate_mac.mm",
     "app/webkit_test_platform_support_android.cc",
     "app/webkit_test_platform_support.h",
     "app/webkit_test_platform_support_linux.cc",
     "app/webkit_test_platform_support_mac.mm",
     "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",
     "browser/layout_test/layout_test_browser_main.h",
     "browser/layout_test/layout_test_browser_main_parts.cc",
     "browser/layout_test/layout_test_browser_main_parts.h",
     "browser/layout_test/layout_test_devtools_frontend.cc",
     "browser/layout_test/layout_test_devtools_frontend.h",
     "browser/layout_test/layout_test_download_manager_delegate.cc",
     "browser/layout_test/layout_test_download_manager_delegate.h",
@@ skipping 23 matching lines @@
     "browser/shell_devtools_frontend.cc",
     "browser/shell_devtools_frontend.h",
     "browser/shell_download_manager_delegate.cc",
     "browser/shell_download_manager_delegate.h",
     "browser/shell.h",
     "browser/shell_javascript_dialog.h",
     "browser/shell_javascript_dialog_mac.mm",
     "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",
     "browser/shell_login_dialog.h",
     "browser/shell_login_dialog_mac.mm",
     "browser/shell_mac.mm",
     "browser/shell_message_filter.cc",
     "browser/shell_message_filter.h",
     "browser/shell_net_log.cc",
     "browser/shell_net_log.h",
@@ skipping 391 matching lines @@
   if (is_android && !is_android_webview_build) {
     # Some tests rely on this tool. It might be nicer if these tests relied on
     # image diff rather than having content shell depend on it.
     datadeps = [
       "//tools/imagediff($host_toolchain)",
     ]
   }
 }
 
 }