Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst...

chrome/browser/ui/webui/web_ui_test_handler.cc

 // Copyright (c) 2011 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 "chrome/browser/ui/webui/web_ui_test_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/web_contents.h"
 
 WebUITestHandler::WebUITestHandler()
     : test_done_(false),
       test_succeeded_(false),
       run_test_done_(false),
       run_test_succeeded_(false),
       is_waiting_(false) {
 }
 
 void WebUITestHandler::PreloadJavaScript(const string16& js_text,
                                          RenderViewHost* preload_host) {
   DCHECK(preload_host);
   preload_host->Send(new ChromeViewMsg_WebUIJavaScript(
       preload_host->routing_id(), string16(), js_text, 0,
       false));
 }
 
 void WebUITestHandler::RunJavaScript(const string16& js_text) {
-  web_ui()->tab_contents()->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
+  web_ui()->web_contents()->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
       string16(), js_text);
 }
 
 bool WebUITestHandler::RunJavaScriptTestWithResult(const string16& js_text) {
   test_succeeded_ = false;
   run_test_succeeded_ = false;
-  RenderViewHost* rvh = web_ui()->tab_contents()->GetRenderViewHost();
+  RenderViewHost* rvh = web_ui()->web_contents()->GetRenderViewHost();
   content::NotificationRegistrar notification_registrar;
   notification_registrar.Add(
       this, content::NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT,
       content::Source<RenderViewHost>(rvh));
   rvh->ExecuteJavascriptInWebFrameNotifyResult(string16(), js_text);
   return WaitForResult();
 }
 
 void WebUITestHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("testResult",
@@ skipping 55 matching lines @@
   // complete.
   if (!run_test_done_ || (run_test_succeeded_ && !test_done_)) {
     ui_test_utils::RunMessageLoop();
   }
 
   is_waiting_ = false;
 
   // To succeed the test must execute as well as pass the test.
   return run_test_succeeded_ && test_succeeded_;
 }