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

content/shell/shell_javascript_dialog_creator.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_javascript_dialog_creator.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 69 matching lines @@
 #endif
 }
 
 void ShellJavaScriptDialogCreator::RunBeforeUnloadDialog(
     WebContents* web_contents,
     const string16& message_text,
     bool is_reload,
     const DialogClosedCallback& callback) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
     printf("CONFIRM NAVIGATION: %s\n", UTF16ToUTF8(message_text).c_str());
-    WebKitTestRunnerHost* controller =
-        WebKitTestRunnerHost::FromRenderViewHost(
-            web_contents->GetRenderViewHost());
+    WebKitTestController* controller = WebKitTestController::Get();
     callback.Run(
         !controller->should_stay_on_page_after_handling_before_unload(),
         string16());
     return;
   }
 
   if (!dialog_request_callback_.is_null()) {
     dialog_request_callback_.Run();
     callback.Run(true, string16());
     dialog_request_callback_.Reset();
@@ skipping 42 matching lines @@
 void ShellJavaScriptDialogCreator::DialogClosed(ShellJavaScriptDialog* dialog) {
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
   DCHECK_EQ(dialog, dialog_.get());
   dialog_.reset();
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
 #endif
 }
 
 }  // namespace content