Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

content/browser/speech/speech_input_browsertest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/speech/speech_input_dispatcher_host.h"
 #include "content/browser/speech/speech_input_manager.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/speech_input_result.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 
+using content::WebContents;
+
 namespace speech_input {
 class FakeSpeechInputManager;
 }
 
 namespace speech_input {
 
 const char* kTestResult = "Pictures of the moon";
 
 class FakeSpeechInputManager : public SpeechInputManager {
  public:
@@ skipping 121 matching lines @@
     // events at that coordinate to trigger speech recognition.
     GURL test_url = testUrl(filename);
     ui_test_utils::NavigateToURL(browser(), test_url);
 
     WebKit::WebMouseEvent mouse_event;
     mouse_event.type = WebKit::WebInputEvent::MouseDown;
     mouse_event.button = WebKit::WebMouseEvent::ButtonLeft;
     mouse_event.x = 0;
     mouse_event.y = 0;
     mouse_event.clickCount = 1;
-    TabContents* tab_contents = browser()->GetSelectedTabContents();
+    WebContents* web_contents = browser()->GetSelectedWebContents();
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
-        content::Source<NavigationController>(&tab_contents->GetController()));
-    tab_contents->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
+        content::Source<NavigationController>(&web_contents->GetController()));
+    web_contents->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
     mouse_event.type = WebKit::WebInputEvent::MouseUp;
-    tab_contents->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
+    web_contents->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
     observer.Wait();
   }
 
   void RunSpeechInputTest(const FilePath::CharType* filename) {
     // The fake speech input manager would receive the speech input
     // request and return the test string as recognition result. The test page
     // then sets the URL fragment as 'pass' if it received the expected string.
     LoadAndStartSpeechInputTest(filename);
 
-    EXPECT_EQ("pass", browser()->GetSelectedTabContents()->GetURL().ref());
+    EXPECT_EQ("pass", browser()->GetSelectedWebContents()->GetURL().ref());
   }
 
   // InProcessBrowserTest methods.
   virtual void SetUpInProcessBrowserTestFixture() {
     fake_speech_input_manager_.set_send_fake_response(true);
     speech_input_manager_ = &fake_speech_input_manager_;
 
     // Inject the fake manager factory so that the test result is returned to
     // the web page.
     SpeechInputDispatcherHost::set_manager(speech_input_manager_);
@@ skipping 58 matching lines @@
 
   // Make the renderer crash. This should trigger SpeechInputDispatcherHost to
   // cancel all pending sessions.
   GURL test_url("about:crash");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   EXPECT_TRUE(fake_speech_input_manager_.did_cancel_all());
 }
 
 }  // namespace speech_input