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

content/browser/renderer_host/render_process_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 "content/browser/renderer_host/render_process_host_browsertest.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/process.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/test_url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 
+using content::WebContents;
+
 RenderProcessHostTest::RenderProcessHostTest() {
   EnableDOMAutomation();
 }
 
 int RenderProcessHostTest::RenderProcessHostCount() {
   content::RenderProcessHost::iterator hosts =
       content::RenderProcessHost::AllHostsIterator();
   int count = 0;
   while (!hosts.IsAtEnd()) {
     if (hosts.GetCurrentValue()->HasConnection())
       count++;
     hosts.Advance();
   }
   return count;
 }
 
 void PostQuit(MessageLoop* loop) {
   loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
 void DoNothing() {}
 
 // Show a tab, activating the current one if there is one, and wait for
 // the renderer process to be created or foregrounded, returning the process
 // handle.
 base::ProcessHandle RenderProcessHostTest::ShowSingletonTab(const GURL& page) {
   browser()->ShowSingletonTab(page);
-  TabContents* tc = browser()->GetSelectedTabContents();
-  CHECK(tc->GetURL() == page);
+  WebContents* wc = browser()->GetSelectedWebContents();
+  CHECK(wc->GetURL() == page);
 
   // Ensure that the backgrounding / foregrounding gets a chance to run.
   content::BrowserThread::PostTaskAndReply(
       content::BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
       base::Bind(DoNothing), MessageLoop::QuitClosure());
   MessageLoop::current()->Run();
 
-  return tc->GetRenderProcessHost()->GetHandle();
+  return wc->GetRenderProcessHost()->GetHandle();
 }
 
 IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessPerTab) {
   // Set max renderers to 1 to force running out of processes.
   content::RenderProcessHost::SetMaxRendererProcessCountForTest(1);
 
   CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   parsed_command_line.AppendSwitch(switches::kProcessPerTab);
 
   int tab_count = 1;
@@ skipping 164 matching lines @@
   host_count++;
 #endif
   EXPECT_EQ(tab_count, browser()->tab_count());
   tab1 = browser()->GetTabContentsAt(tab_count - 1);
   rph3 = tab1->GetRenderProcessHost();
   EXPECT_EQ(tab1->GetURL(), bookmarks);
   EXPECT_EQ(host_count, RenderProcessHostCount());
   EXPECT_NE(rph1, rph3);
   EXPECT_NE(rph2, rph3);
 }