Content Shell: Fix broken test controller lifetime.

content/shell/browser/layout_test/layout_test_browser_main.cc

 // 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.
 
 #include "content/shell/browser/shell_browser_main.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 129 matching lines @@
     return false;
 
 #if defined(OS_ANDROID)
   // There will be left-over tasks in the queue for Android because the
   // main window is being destroyed. Run them before starting the next test.
   base::MessageLoop::current()->RunUntilIdle();
 #endif
   return true;
 }
 
+int RunTests(const scoped_ptr<content::BrowserMainRunner>& main_runner) {
+  content::WebKitTestController test_controller;
+  {
+    // We're outside of the message loop here, and this is a test.
+    base::ThreadRestrictions::ScopedAllowIO allow_io;
+    base::FilePath temp_path;
+    base::GetTempDir(&temp_path);
+    test_controller.SetTempPath(temp_path);
+  }
+  std::string test_string;
+  CommandLine::StringVector args = CommandLine::ForCurrentProcess()->GetArgs();
+  size_t command_line_position = 0;
+  bool ran_at_least_once = false;
+
+  std::cout << "#READY\n";
+  std::cout.flush();
+
+  while (GetNextTest(args, &command_line_position, &test_string)) {
+    if (!RunOneTest(test_string, &ran_at_least_once, main_runner))
+      break;
+  }
+  if (!ran_at_least_once) {
+    base::MessageLoop::current()->PostTask(FROM_HERE,
+                                           base::MessageLoop::QuitClosure());
+    main_runner->Run();
+  }
+
+#if defined(OS_ANDROID)
+  // We need to execute 'main_runner->Shutdown()' before the test_controller
+  // destructs when running on Android, and after it destructs when running
+  // anywhere else.
+  main_runner->Shutdown();
+#endif
+
+  return 0;
+}
+
 }  // namespace
 
 // Main routine for running as the Browser process.
 int LayoutTestBrowserMain(
     const content::MainFunctionParams& parameters,
     const scoped_ptr<content::BrowserMainRunner>& main_runner) {
   base::ScopedTempDir browser_context_path_for_layout_tests;
 
   CHECK(browser_context_path_for_layout_tests.CreateUniqueTempDir());
   CHECK(!browser_context_path_for_layout_tests.path().MaybeAsASCII().empty());
@@ skipping 15 matching lines @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kCheckLayoutTestSysDeps)) {
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::MessageLoop::QuitClosure());
     main_runner->Run();
     content::Shell::CloseAllWindows();
     main_runner->Shutdown();
     return 0;
   }
 
-  content::WebKitTestController test_controller;
-  {
-    // We're outside of the message loop here, and this is a test.
-    base::ThreadRestrictions::ScopedAllowIO allow_io;
-    base::FilePath temp_path;
-    base::GetTempDir(&temp_path);
-    test_controller.SetTempPath(temp_path);
-  }
-  std::string test_string;
-  CommandLine::StringVector args = CommandLine::ForCurrentProcess()->GetArgs();
-  size_t command_line_position = 0;
-  bool ran_at_least_once = false;
-
-  std::cout << "#READY\n";
-  std::cout.flush();
-
-  while (GetNextTest(args, &command_line_position, &test_string)) {
-    if (!RunOneTest(test_string, &ran_at_least_once, main_runner))
-      break;
-  }
-  if (!ran_at_least_once) {
-    base::MessageLoop::current()->PostTask(FROM_HERE,
-                                           base::MessageLoop::QuitClosure());
-    main_runner->Run();
-  }
-
-#if defined(OS_ANDROID)
-  // Android should only execute Shutdown() here when running layout tests.
-  main_runner->Shutdown();
-#endif
-
-  exit_code = 0;
+  exit_code = RunTests(main_runner);

[Peter Beverloo, 2014/10/18 09:17:58]

Hmm. RunTests never returns anything that's non-zero, but it's common for
RunTests()-like functions to return an int so that's OK for consistency.

 
 #if !defined(OS_ANDROID)
   main_runner->Shutdown();
 #endif
 
   return exit_code;
 }