Add WebContents source to methods in WebContentsDelegate

content/public/test/content_browser_test_utils.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/public/test/content_browser_test_utils.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
@@ skipping 50 matching lines @@
 
   window->LoadDataWithBaseURL(url, data, base_url);
   same_tab_observer.Wait();
 }
 
 void NavigateToURL(Shell* window, const GURL& url) {
   NavigateToURLBlockUntilNavigationsComplete(window, url, 1);
 }
 
 void WaitForAppModalDialog(Shell* window) {
-  ShellJavaScriptDialogManager* dialog_manager=
+  ShellJavaScriptDialogManager* dialog_manager =
       static_cast<ShellJavaScriptDialogManager*>(
-          window->GetJavaScriptDialogManager());
+          window->GetJavaScriptDialogManager(window->web_contents()));
 
   scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner();
   dialog_manager->set_dialog_request_callback(runner->QuitClosure());
   runner->Run();
 }
 
 ShellAddedObserver::ShellAddedObserver()
     : shell_(NULL) {
   Shell::SetShellCreatedCallback(
       base::Bind(&ShellAddedObserver::ShellCreated, base::Unretained(this)));
@@ skipping 65 matching lines @@
 }
 
 bool WebContentsAddedObserver::RenderViewCreatedCalled() {
   if (child_observer_)
     return child_observer_->render_view_created_called_;
 
   return false;
 }
 
 }  // namespace content