[content shell] create a central WebKitTestController object that manages the test cycle

content/shell/shell_browser_main.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 "content/shell/shell_browser_main.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_main_runner.h"
-#include "content/shell/shell.h"
-#include "content/shell/shell_browser_context.h"
-#include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_switches.h"
 #include "content/shell/webkit_test_runner_host.h"
 #include "webkit/support/webkit_support.h"
 
 namespace {
 
 GURL GetURLForLayoutTest(const char* test_name,
                          std::string* expected_pixel_hash) {
   std::string path_or_url = test_name;
   std::string pixel_hash;
@@ skipping 27 matching lines @@
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kCheckLayoutTestSysDeps)) {
     return 0;
   }
 
   bool layout_test_mode =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree);
 
   if (layout_test_mode) {
+    content::WebKitTestController test_controller;
+
     char test_string[2048];
-    content::ShellBrowserContext* browser_context =
-        static_cast<content::ShellContentBrowserClient*>(
-            content::GetContentClient()->browser())->browser_context();
-
 #if defined(OS_ANDROID)
     puts("#READY");
     fflush(stdout);
 #endif
 
     while (fgets(test_string, sizeof(test_string), stdin)) {
       char *new_line_position = strchr(test_string, '\n');
       if (new_line_position)
         *new_line_position = '\0';
       if (test_string[0] == '\0')
         continue;
 
       // Test header.
       printf("Content-Type: text/plain\n");
 
       std::string pixel_hash;
-      content::Shell::CreateNewWindow(
-          browser_context,
-          GetURLForLayoutTest(test_string, &pixel_hash),
-          NULL,
-          MSG_ROUTING_NONE,
-          NULL);
-      content::WebKitTestRunnerHost::Init(pixel_hash);
+      GURL test_url = GetURLForLayoutTest(test_string, &pixel_hash);
+      content::WebKitTestController::Get()->PrepareForLayoutTest(
+          test_url, pixel_hash);
 
       main_runner_->Run();
 
-      content::Shell::CloseAllWindows();
-
       // Test footer.
       printf("#EOF\n");
       fflush(stdout);
       fflush(stderr);
+
+      if (!content::WebKitTestController::Get()->ResetAfterLayoutTest())
+        break;
     }
     exit_code = 0;
   } else {
     exit_code = main_runner_->Run();
   }
 
   main_runner_->Shutdown();
 
   return exit_code;
 }