Chromium support of running DumpRenderTree as an apk on Android

base/test/test_suite.cc

 // Copyright (c) 2012 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.
 
 #include "base/test/test_suite.h"
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 10 matching lines @@
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/test/mock_chrome_application_mac.h"
 #endif
 
 #if defined(OS_ANDROID)
-#include "base/test/test_stub_android.h"
+#include "base/test/test_support_android.h"
 #endif
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
 namespace {
 
 class MaybeTestDisabler : public testing::EmptyTestEventListener {
  public:
@@ skipping 53 matching lines @@
   testing::InitGoogleTest(&argc, argv);
 #if defined(OS_LINUX) && defined(USE_AURA)
   // When calling native char conversion functions (e.g wrctomb) we need to
   // have the locale set. In the absence of such a call the "C" locale is the
   // default. In the gtk code (below) gtk_init() implicitly sets a locale.
   setlocale(LC_ALL, "");
 #elif defined(TOOLKIT_GTK)
   gtk_init_check(&argc, &argv);
 #endif  // defined(TOOLKIT_GTK)
   if (create_at_exit_manager)
-    at_exit_manager_.reset(new base::AtExitManager);
+    at_exit_manager_.reset(new base::ShadowingAtExitManager);

[Paweł Hajdan Jr., 2012/05/25 19:06:08]

This looks Very Bad to me. You should not need that. Why are you using it here?

[Xianzhu, 2012/05/29 17:15:55]

Now use #if !defined(ANDROID_APK_TEST_TARGET). Will change to #if
!defined(OS_ANDROID) after we convert all unit tests to apks.

 
   // Don't add additional code to this function.  Instead add it to
   // Initialize().  See bug 6436.
 }
 
 
 // static
 bool TestSuite::IsMarkedFlaky(const testing::TestInfo& test) {
   return strncmp(test.name(), "FLAKY_", 6) == 0;
 }
@@ skipping 114 matching lines @@
 #endif  // defined(OS_WIN)
 }
 
 void TestSuite::Initialize() {
 #if defined(OS_MACOSX)
   // Some of the app unit tests spin runloops.
   mock_cr_app::RegisterMockCrApp();
 #endif
 
 #if defined(OS_ANDROID)
-  InitAndroidTestStub();
-#endif
-
+  InitAndroidTest();
+#else
   // Initialize logging.
   FilePath exe;
   PathService::Get(base::FILE_EXE, &exe);
   FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log"));
   logging::InitLogging(
       log_filename.value().c_str(),
       logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
       logging::LOCK_LOG_FILE,
       logging::DELETE_OLD_LOG_FILE,
       logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
   // We want process and thread IDs because we may have multiple processes.
   // Note: temporarily enabled timestamps in an effort to catch bug 6361.
   logging::SetLogItems(true, true, true, true);
+#endif  // else defined(OS_ANDROID)
 
   CHECK(base::EnableInProcessStackDumping());
 #if defined(OS_WIN)
   // Make sure we run with high resolution timer to minimize differences
   // between production code and test code.
   base::Time::EnableHighResolutionTimer(true);
 #endif  // defined(OS_WIN)
 
   // In some cases, we do not want to see standard error dialogs.
   if (!base::debug::BeingDebugged() &&
       !CommandLine::ForCurrentProcess()->HasSwitch("show-error-dialogs")) {
     SuppressErrorDialogs();
     base::debug::SetSuppressDebugUI(true);
     logging::SetLogAssertHandler(UnitTestAssertHandler);
   }
 
-#if !defined(OS_ANDROID)
-  // TODO(michaelbai): The icu can not be compiled in Android now, this should
-  // be enabled once icu is ready. http://b/5406077.
   icu_util::Initialize();
-#endif
 
   CatchMaybeTests();
   ResetCommandLine();
 
   TestTimeouts::Initialize();
 }
 
 void TestSuite::Shutdown() {
 }