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

content/browser/renderer_host/render_view_host_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/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.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/tab_contents/tab_contents.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
 
+using content::WebContents;
+
 class RenderViewHostTest : public InProcessBrowserTest {
  public:
   RenderViewHostTest() {}
 };
 
 
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest,
                        ExecuteJavascriptAndGetValue) {
   ASSERT_TRUE(test_server()->Start());
   GURL empty_url(test_server()->GetURL("files/empty.html"));
   ui_test_utils::NavigateToURL(browser(), empty_url);
 
   RenderViewHost* rvh =
-      browser()->GetSelectedTabContents()->GetRenderViewHost();
+      browser()->GetSelectedWebContents()->GetRenderViewHost();
 
   {
     Value* value = rvh->ExecuteJavascriptAndGetValue(string16(),
                                                      ASCIIToUTF16("!false;"));
     EXPECT_EQ(Value::TYPE_BOOLEAN, value->GetType());
     bool bool_value;
     EXPECT_TRUE(value->GetAsBoolean(&bool_value));
     EXPECT_TRUE(bool_value);
   }
 
@@ skipping 113 matching lines @@
     EXPECT_TRUE(list_value->Get(1, &element_value));
     EXPECT_EQ(Value::TYPE_INTEGER, element_value->GetType());
     EXPECT_TRUE(list_value->Get(2, &element_value));
     EXPECT_EQ(Value::TYPE_BOOLEAN, element_value->GetType());
   }
 }
 
 class RenderViewHostTestWebContentsObserver
     : public content::WebContentsObserver {
  public:
-  explicit RenderViewHostTestWebContentsObserver(TabContents* tab_contents)
-      : content::WebContentsObserver(tab_contents),
+  explicit RenderViewHostTestWebContentsObserver(WebContents* web_contents)
+      : content::WebContentsObserver(web_contents),
         navigation_count_(0) {}
   virtual ~RenderViewHostTestWebContentsObserver() {}
 
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE {
     observed_socket_address_ = params.socket_address;
     base_url_ = params.base_url;
     ++navigation_count_;
   }
@@ skipping 12 matching lines @@
   net::HostPortPair observed_socket_address_;
   GURL base_url_;
   int navigation_count_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestWebContentsObserver);
 };
 
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) {
   ASSERT_TRUE(test_server()->Start());
   RenderViewHostTestWebContentsObserver observer(
-      browser()->GetSelectedTabContents());
+      browser()->GetSelectedWebContents());
 
   GURL test_url = test_server()->GetURL("files/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   EXPECT_EQ(test_server()->host_port_pair().ToString(),
             observer.observed_socket_address().ToString());
   EXPECT_EQ(1, observer.navigation_count());
 }
 
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BaseURLParam) {
   ASSERT_TRUE(test_server()->Start());
   RenderViewHostTestWebContentsObserver observer(
-      browser()->GetSelectedTabContents());
+      browser()->GetSelectedWebContents());
 
   // Base URL is not set if it is the same as the URL.
   GURL test_url = test_server()->GetURL("files/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
   EXPECT_TRUE(observer.base_url().is_empty());
   EXPECT_EQ(1, observer.navigation_count());
 
   // But should be set to the original page when reading MHTML.
   test_url = net::FilePathToFileURL(test_server()->document_root().Append(
       FILE_PATH_LITERAL("google.mht")));
   ui_test_utils::NavigateToURL(browser(), test_url);
   EXPECT_EQ("http://www.google.com/", observer.base_url().spec());
 }