Revert of [Android] Refactor the native test wrappers.

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/chrome_build.gni")
 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")
@@ skipping 332 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:native_test_support",
+        "//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 328 matching lines @@
       "//gpu/blink",
       "//testing/gtest",
       "//third_party/WebKit/public:blink",
       "//ui/base",
       "//ui/gfx",
       "//ui/gfx/geometry",
       "//ui/gl",
     ]
   }
 }