Remove duplicate call to InitAndroidTest.

The method is called from test_suite.cc.
Also moving methods in test_support_android inside a namespace.

BUG=125059
TEST=None

Review URL: https://chromiumcodereview.appspot.com/10538065

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141473 0039d316-1c4b-4281-b951-d872f2087c98

base/test/test_support_android.cc

@@ -170,6 +170,8 @@ void InitPathProvider(int key) {
 
 }  // namespace
 
+namespace base {
+
 void InitAndroidTestLogging() {
   logging::InitLogging(NULL,
                        logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
@@ -184,9 +186,9 @@ void InitAndroidTestLogging() {
 }
 
 void InitAndroidTestPaths() {
-  InitPathProvider(base::DIR_MODULE);
-  InitPathProvider(base::DIR_CACHE);
-  InitPathProvider(base::DIR_ANDROID_APP_DATA);
+  InitPathProvider(DIR_MODULE);
+  InitPathProvider(DIR_CACHE);
+  InitPathProvider(DIR_ANDROID_APP_DATA);
 }
 
 void InitAndroidTestMessageLoop() {
@@ -198,3 +200,4 @@ void InitAndroidTest() {
   InitAndroidTestPaths();
   InitAndroidTestMessageLoop();
 }
+}  // namespace base

base/test/test_support_android.h

@@ -5,6 +5,8 @@
 #ifndef BASE_TEST_TEST_SUPPORT_ANDROID_H_
 #define BASE_TEST_TEST_SUPPORT_ANDROID_H_
 
+namespace base {
+
 // Init logging for tests on Android. Logs will be output into Android's logcat.
 void InitAndroidTestLogging();
 
@@ -17,4 +19,6 @@ void InitAndroidTestMessageLoop();
 // Do all of the initializations above.
 void InitAndroidTest();
 
+}  // namespace base
+
 #endif  // BASE_TEST_TEST_SUPPORT_ANDROID_H_

testing/android/generate_native_test.py

@@ -211,10 +211,6 @@ def main(argv):
   if options.jars:
     jar_list = options.jars.replace('"', '').split()
 
-  # Ignore --ant-compile when building with Android source.
-  if 'ANDROID_BUILD_TOP' in os.environ:
-    options.ant_compile = False
-
   ntag = NativeTestApkGenerator(native_library=options.native_library,
                                 jars=jar_list,
                                 output_directory=options.output,

testing/android/native_test_launcher.cc

@@ -26,7 +26,6 @@
 #include "base/stringprintf.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
-#include "base/test/test_support_android.h"
 #include "gtest/gtest.h"
 #include "testing/android/jni/chrome_native_test_activity_jni.h"
 
@@ -180,8 +179,6 @@ static void RunTests(JNIEnv* env,
   base::android::RegisterLocaleUtils(env);
   base::android::RegisterPathUtils(env);
 
-  InitAndroidTest();
-
   FilePath files_dir(base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
   // A few options, such "--gtest_list_tests", will just use printf directly
   // and won't use the "AndroidLogPrinter". Redirect stdout to a known file.

webkit/support/platform_support_android.cc

@@ -33,7 +33,7 @@ const char kDumpRenderTreeDir[] = "/data/drt";
 namespace webkit_support {
 
 void BeforeInitialize(bool unit_test_mode) {
-  InitAndroidTestPaths();
+  base::InitAndroidTestPaths();
 
   // Set XML_CATALOG_FILES environment variable to blank to prevent libxml from
   // loading and complaining the non-exsistent /etc/xml/catalog file.

webkit/support/webkit_support.cc

@@ -110,7 +110,7 @@ void InitLogging() {
 
 #if defined(OS_ANDROID)
   // On Android we expect the log to appear in logcat.
-  InitAndroidTestLogging();
+  base::InitAndroidTestLogging();
 #else
   FilePath log_filename;
   PathService::Get(base::DIR_EXE, &log_filename);