Refactor MainHook into TestSuite.

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"
 #include "base/debug/debug_on_start_win.h"
 #include "base/debug/debugger.h"
 #include "base/debug/stack_trace.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
 #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"
 #if defined(OS_IOS)
+#include "base/test/run_hook_ios.h"
 #include "base/test/test_listener_ios.h"
 #else
 #include "base/test/mock_chrome_application_mac.h"
 #endif  // OS_IOS
 #endif  // OS_MACOSX
 
 #if defined(OS_ANDROID)
 #include "base/test/test_support_android.h"
 #endif
 
 #if defined(OS_IOS)
 #include "base/test/test_support_ios.h"

[TVL, 2013/02/27 15:59:35]

since you already have this file, does it make more sense to put the support in
there stead of the new file?

[lliabraa, 2013/02/27 20:31:31]

Done.

 #endif
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
 namespace {
 
 class MaybeTestDisabler : public testing::EmptyTestEventListener {
  public:
@@ skipping 58 matching lines @@
   gtk_init_check(&argc, &argv);
 #endif  // defined(TOOLKIT_GTK)
 
   // On Android, AtExitManager is created in
   // testing/android/native_test_wrapper.cc before main() is called.
 #if !defined(OS_ANDROID)
   if (create_at_exit_manager)
     at_exit_manager_.reset(new base::AtExitManager);
 #endif
 
+#if defined(OS_IOS)
+  RunHook::Init(this, argc, argv);
+#endif
+
   // Don't add additional code to this function.  Instead add it to
   // Initialize().  See bug 6436.
 }
 
 
 // static
 bool TestSuite::IsMarkedMaybe(const testing::TestInfo& test) {
   return strncmp(test.name(), "MAYBE_", 6) == 0;
 }
 
 void TestSuite::CatchMaybeTests() {
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new MaybeTestDisabler);
 }
 
 void TestSuite::ResetCommandLine() {
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestClientInitializer);
 }
 
 // Don't add additional code to this method.  Instead add it to
 // Initialize().  See bug 6436.
 int TestSuite::Run() {
+#if defined(OS_IOS)
+  // When TestSuite::Run() is invoked initially, RunTestsFromApp() will fire up
+  // an iOS app which will invoke TestSuite::Run() again. On the second
+  // invocation, RunTestsFromApp is a no-op and TestSuite::Run() is procesessed
+  // normally, but in the context of the iOS app.

[TVL, 2013/02/27 15:59:35]

I'd probably just put this comment on the RunTestsFromApp method, this file is
already full of ifdefs and hard to read, so the comment doesn't seem like it's
helping much.

[lliabraa, 2013/02/27 20:31:31]

Done.

+  RunHook::RunTestsFromApp();
+#endif
+
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool scoped_pool;
 #endif
 
   Initialize();
   std::string client_func =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kTestChildProcess);
 
   // Check to see if we are being run as a client process.
@@ skipping 88 matching lines @@
   icu_util::Initialize();
 
   CatchMaybeTests();
   ResetCommandLine();
 
   TestTimeouts::Initialize();
 }
 
 void TestSuite::Shutdown() {
 }