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

This will let us put android test code unrelated to native test APK wrapping
elsewhere in testing/android/*.

BUG=

Review URL: https://codereview.chromium.org/1071573003

Cr-Commit-Position: refs/heads/master@{#324512}

21 files changed, 23 insertions, 23 deletions

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 74889d5..3308494 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -912,7 +912,7 @@ if (is_linux && !is_chromeos) {
     ]
 
     if (is_android) {
-      deps += [ "//testing/android:native_test_native_code" ]
+      deps += [ "//testing/android/native_test:native_test_native_code" ]
     }
   }
 
@@ -1369,7 +1369,7 @@ test("base_unittests") {
   }
 
   if (is_android) {
-    deps += [ "//testing/android:native_test_native_code" ]
+    deps += [ "//testing/android/native_test:native_test_native_code" ]
     set_sources_assignment_filter([])
     sources += [ "debug/proc_maps_linux_unittest.cc" ]
     set_sources_assignment_filter(sources_assignment_filter)
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index 05bafab..792d92ca 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -31,7 +31,7 @@
          'apk_name': '<(test_suite_name)',
          'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk',
          'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk',
-         'java_in_dir': '<(DEPTH)/testing/android/java',
+         'java_in_dir': '<(DEPTH)/testing/android/native_test/java',
          'native_lib_target': 'lib<(test_suite_name)',
          # TODO(yfriedman, cjhopman): Support managed installs for gtests.
          'gyp_managed_install': 0,
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 619cf92..6e367da 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1253,7 +1253,7 @@ if (!is_android) {
       # Some android targets still depend on --gc-sections to link.
       # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
       ldflags = [ "-Wl,--gc-sections" ]
-      deps += [ "//testing/android:native_test_native_code" ]
+      deps += [ "//testing/android/native_test:native_test_native_code" ]
     } else {
       sources +=
           rebase_path(unit_gypi_values.chrome_unit_tests_non_android_sources,
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/content/shell/android/browsertests_apk/content_browser_tests_android.cc
index d73ea6f..86f43b5 100644
--- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc
+++ b/content/shell/android/browsertests_apk/content_browser_tests_android.cc
@@ -27,7 +27,7 @@
 #include "content/shell/app/shell_main_delegate.h"
 #include "jni/ContentBrowserTestsActivity_jni.h"
 #include "media/base/media_switches.h"
-#include "testing/android/native_test_util.h"
+#include "testing/android/native_test/native_test_util.h"
 
 using testing::native_test_util::ArgsToArgv;
 using testing::native_test_util::ParseArgsFromCommandLineFile;
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index a34cd5c..b26c93e 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -370,7 +370,7 @@ if (!is_mac) {
       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
@@ -584,7 +584,7 @@ if (!is_mac) {  # TODO(GYP) enable on Mac once it links.
         "../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" ]
@@ -657,7 +657,7 @@ if (!is_mac) {  # TODO(GYP) enable on Mac once it links.
     ]
 
     if (is_android) {
-      deps += [ "//testing/android:native_test_native_code" ]
+      deps += [ "//testing/android/native_test:native_test_native_code" ]
     }
   }
 
@@ -684,7 +684,7 @@ if (!is_mac) {  # TODO(GYP) enable on Mac once it links.
     ]
 
     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",
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn
index 259df32..5e1ffb5 100644
--- a/gpu/BUILD.gn
+++ b/gpu/BUILD.gn
@@ -126,7 +126,7 @@ test("gl_tests") {
   libs = []
 
   if (is_android) {
-    deps += [ "//testing/android:native_test_native_code" ]
+    deps += [ "//testing/android/native_test:native_test_native_code" ]
     libs += [ "android" ]
   }
 }
diff --git a/media/BUILD.gn b/media/BUILD.gn
index f029be7..27ef3aa 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -625,7 +625,7 @@ test("media_unittests") {
     deps += [
       "//media/base/android",
       # TODO(GYP)
-      #"//testing/android:native_test_native_code"
+      #"//testing/android/native_test:native_test_native_code"
     ]
   }
 
diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn
index 70aafa0..36211d7 100644
--- a/remoting/BUILD.gn
+++ b/remoting/BUILD.gn
@@ -113,7 +113,7 @@ if (!is_win && !is_mac) {
     ]
 
     if (is_android) {
-      deps += [ "//testing/android:native_test_native_code" ]
+      deps += [ "//testing/android/native_test:native_test_native_code" ]
     } else {
       deps += [
         "//remoting/client/plugin",
diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
index 211c22b..1794199 100644
--- a/sandbox/linux/BUILD.gn
+++ b/sandbox/linux/BUILD.gn
@@ -147,7 +147,7 @@ shared_library("sandbox_linux_jni_unittests") {
     ":sandbox_linux_unittests_sources",
   ]
   if (is_android) {
-    deps += [ "//testing/android:native_test_native_code" ]
+    deps += [ "//testing/android/native_test:native_test_native_code" ]
   }
 }
 
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index 632d687..b26e01e 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -12,9 +12,9 @@
           'message': 'building native pieces of native test package',
           'type': 'static_library',
           'sources': [
-            'native_test_jni_onload.cc',
-            'native_test_launcher.cc',
-            'native_test_launcher.h',
+            'native_test/native_test_jni_onload.cc',
+            'native_test/native_test_launcher.cc',
+            'native_test/native_test_launcher.h',
           ],
           'dependencies': [
             '../../base/base.gyp:base',
@@ -30,7 +30,7 @@
           'target_name': 'native_test_jni_headers',
           'type': 'none',
           'sources': [
-            'java/src/org/chromium/native_test/ChromeNativeTestActivity.java'
+            'native_test/java/src/org/chromium/native_test/ChromeNativeTestActivity.java'
           ],
           'variables': {
             'jni_gen_package': 'testing',
@@ -42,8 +42,8 @@
           'target_name': 'native_test_util',
           'type': 'static_library',
           'sources': [
-            'native_test_util.cc',
-            'native_test_util.h',
+            'native_test/native_test_util.cc',
+            'native_test/native_test_util.h',
           ],
           'dependencies': [
             '../../base/base.gyp:base',
diff --git a/testing/android/BUILD.gn b/testing/android/native_test/BUILD.gn
index e0288f6..e0288f6 100644
--- a/testing/android/BUILD.gn
+++ b/testing/android/native_test/BUILD.gn
diff --git a/testing/android/README.chromium b/testing/android/native_test/README.chromium
index c00255a..c00255a 100644
--- a/testing/android/README.chromium
+++ b/testing/android/native_test/README.chromium
diff --git a/testing/android/java/AndroidManifest.xml b/testing/android/native_test/java/AndroidManifest.xml
index 244f116..244f116 100644
--- a/testing/android/java/AndroidManifest.xml
+++ b/testing/android/native_test/java/AndroidManifest.xml
diff --git a/testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java b/testing/android/native_test/java/src/org/chromium/native_test/ChromeNativeTestActivity.java
index 4aafa7c..4aafa7c 100644
--- a/testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java
+++ b/testing/android/native_test/java/src/org/chromium/native_test/ChromeNativeTestActivity.java
diff --git a/testing/android/java/src/org/chromium/native_test/ChromeNativeTestInstrumentationTestRunner.java b/testing/android/native_test/java/src/org/chromium/native_test/ChromeNativeTestInstrumentationTestRunner.java
index 4e1a067..4e1a067 100644
--- a/testing/android/java/src/org/chromium/native_test/ChromeNativeTestInstrumentationTestRunner.java
+++ b/testing/android/native_test/java/src/org/chromium/native_test/ChromeNativeTestInstrumentationTestRunner.java
diff --git a/testing/android/native_test_jni_onload.cc b/testing/android/native_test/native_test_jni_onload.cc
index de42356d..041aa74 100644
--- a/testing/android/native_test_jni_onload.cc
+++ b/testing/android/native_test/native_test_jni_onload.cc
@@ -5,7 +5,7 @@
 #include "base/android/base_jni_onload.h"
 #include "base/android/jni_android.h"
 #include "base/bind.h"
-#include "testing/android/native_test_launcher.h"
+#include "testing/android/native_test/native_test_launcher.h"
 
 namespace {
 
diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test/native_test_launcher.cc
index 4cc87d2..51edf36 100644
--- a/testing/android/native_test_launcher.cc
+++ b/testing/android/native_test/native_test_launcher.cc
@@ -26,7 +26,7 @@
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "jni/ChromeNativeTestActivity_jni.h"
-#include "testing/android/native_test_util.h"
+#include "testing/android/native_test/native_test_util.h"
 
 using testing::native_test_util::ArgsToArgv;
 using testing::native_test_util::ParseArgsFromCommandLineFile;
diff --git a/testing/android/native_test_launcher.h b/testing/android/native_test/native_test_launcher.h
index cdd1e76..cdd1e76 100644
--- a/testing/android/native_test_launcher.h
+++ b/testing/android/native_test/native_test_launcher.h
diff --git a/testing/android/native_test_util.cc b/testing/android/native_test/native_test_util.cc
index 885f297..2eaf971 100644
--- a/testing/android/native_test_util.cc
+++ b/testing/android/native_test/native_test_util.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 "testing/android/native_test_util.h"
+#include "testing/android/native_test/native_test_util.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
diff --git a/testing/android/native_test_util.h b/testing/android/native_test/native_test_util.h
index ef17e52..ef17e52 100644
--- a/testing/android/native_test_util.h
+++ b/testing/android/native_test/native_test_util.h
diff --git a/testing/test.gni b/testing/test.gni
index 3afb9f7..ec56f01 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -67,7 +67,7 @@ template("test") {
       }
       deps = []
       if (!defined(invoker.use_launcher) || invoker.use_launcher) {
-        deps += [ "//testing/android:native_test_native_code" ]
+        deps += [ "//testing/android/native_test:native_test_native_code" ]
       }
       if (defined(invoker.deps)) {
         deps += invoker.deps