[Android] Move testing/android/ to testing/android/native_test/

content/test/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/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//testing/test.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
@@ skipping 352 matching lines @@
     if (is_android) {
       sources += rebase_path(
               content_tests_gypi_values.content_browsertests_android_sources,
               ".",
               "//content")
       sources -=
           [ "../browser/battery_status/battery_monitor_impl_browsertest.cc" ]
       deps += [
         "//content/shell/android:content_shell_jni_headers",
         "//content/shell:content_shell_lib",
-        "//testing/android:native_test_util",
+        "//testing/android/native_test:native_test_util",
       ]
 
       use_launcher = false
     }
 
     if (is_mac) {
       sources += [ "../renderer/external_popup_menu_browsertest.cc" ]
       deps += [
         # Needed for Content Shell.app's Helper.
         #"//content/shell:content_shell",  #TODO(GYP) enable for mac
@@ skipping 193 matching lines @@
     if (is_android) {
       sources += rebase_path(
               content_tests_gypi_values.content_unittests_android_sources,
               ".",
               "//content")
       sources -= [
         "../browser/geolocation/network_location_provider_unittest.cc",
         "../browser/geolocation/wifi_data_provider_common_unittest.cc",
         "../browser/webui/url_data_manager_backend_unittest.cc",
       ]
-      deps += [ "//testing/android:native_test_native_code" ]
+      deps += [ "//testing/android/native_test:native_test_native_code" ]
     }
     if (!is_android && !is_ios) {
       deps += [ "//third_party/libvpx" ]
     }
 
     if (use_aura) {
       deps += [
         "//ui/aura",
         "//ui/wm",
       ]
@@ skipping 52 matching lines @@
       "//content/test:test_support",
       "//cc",
       "//skia",
       "//testing/gtest",
       "//testing/perf",
       "//ui/gfx",
       "//ui/gfx/geometry",
     ]
 
     if (is_android) {
-      deps += [ "//testing/android:native_test_native_code" ]
+      deps += [ "//testing/android/native_test:native_test_native_code" ]
     }
   }
 
   test("content_gl_tests") {
     sources = [
       "../common/gpu/client/gl_helper_unittest.cc",
       "../common/gpu/client/gpu_in_process_context_tests.cc",
     ]
 
     deps = [
       ":test_support",
       "//base/allocator",
       "//base/test:test_support",
       "//content/public/common",
       "//gpu/command_buffer/common",
       "//testing/gtest",
       "//third_party/WebKit/public:blink",
       "//ui/base",
       "//ui/gfx",
       "//ui/gfx:test_support",
       "//ui/gfx/geometry",
       "//ui/gl",
       "//v8",
     ]
 
     if (is_android) {
-      deps += [ "//testing/android:native_test_native_code" ]
+      deps += [ "//testing/android/native_test:native_test_native_code" ]
     } else {
       data_deps = [
         "//third_party/ffmpeg",
         "//third_party/mesa:osmesa",
       ]
     }
   }
 
   test("content_gl_benchmark") {
     sources = [
       "../common/gpu/client/gl_helper_benchmark.cc",
     ]
 
     deps = [
       ":test_support",
       "//base/allocator",
       "//base/test:test_support",
       "//content/public/common",
       "//testing/gtest",
       "//third_party/WebKit/public:blink",
       "//ui/base",
       "//ui/gfx",
       "//ui/gfx/geometry",
       "//ui/gl",
     ]
   }
 }