Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

content/browser/renderer_host/render_process_host_browsertest.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/process.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.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;
@@ skipping 18 matching lines @@
       hosts.Advance();
     }
     return count;
   }
 
   // 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 ShowSingletonTab(const GURL& page) {
     chrome::ShowSingletonTab(browser(), page);
-    WebContents* wc = browser()->GetActiveWebContents();
+    WebContents* wc = chrome::GetActiveWebContents(browser());
     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(&base::DoNothing), MessageLoop::QuitClosure());
     MessageLoop::current()->Run();
 
     return wc->GetRenderProcessHost()->GetHandle();
   }
 
   // When we hit the max number of renderers, verify that the way we do process
   // sharing behaves correctly.  In particular, this test is verifying that even
   // when we hit the max process limit, that renderers of each type will wind up
   // in a process of that type, even if that means creating a new process.
   void TestProcessOverflow() {
     int tab_count = 1;
     int host_count = 1;
     WebContents* tab1 = NULL;
     WebContents* tab2 = NULL;
     content::RenderProcessHost* rph1 = NULL;
     content::RenderProcessHost* rph2 = NULL;
     content::RenderProcessHost* rph3 = NULL;
 
     // Change the first tab to be the new tab page (TYPE_WEBUI).
     GURL newtab(chrome::kTestNewTabURL);
     ui_test_utils::NavigateToURL(browser(), newtab);
     EXPECT_EQ(tab_count, browser()->tab_count());
-    tab1 = browser()->GetWebContentsAt(tab_count - 1);
+    tab1 = chrome::GetWebContentsAt(browser(), tab_count - 1);
     rph1 = tab1->GetRenderProcessHost();
     EXPECT_EQ(tab1->GetURL(), newtab);
     EXPECT_EQ(host_count, RenderProcessHostCount());
 
     // Create a new TYPE_TABBED tab.  It should be in its own process.
     GURL page1("data:text/html,hello world1");
     chrome::ShowSingletonTab(browser(), page1);
     if (browser()->tab_count() == tab_count)
       ui_test_utils::WaitForNewTab(browser());
     tab_count++;
     host_count++;
     EXPECT_EQ(tab_count, browser()->tab_count());
-    tab1 = browser()->GetWebContentsAt(tab_count - 1);
+    tab1 = chrome::GetWebContentsAt(browser(), tab_count - 1);
     rph2 = tab1->GetRenderProcessHost();
     EXPECT_EQ(tab1->GetURL(), page1);
     EXPECT_EQ(host_count, RenderProcessHostCount());
     EXPECT_NE(rph1, rph2);
 
     // Create another TYPE_TABBED tab.  It should share the previous process.
     GURL page2("data:text/html,hello world2");
     chrome::ShowSingletonTab(browser(), page2);
     if (browser()->tab_count() == tab_count)
       ui_test_utils::WaitForNewTab(browser());
     tab_count++;
     EXPECT_EQ(tab_count, browser()->tab_count());
-    tab2 = browser()->GetWebContentsAt(tab_count - 1);
+    tab2 = chrome::GetWebContentsAt(browser(), tab_count - 1);
     EXPECT_EQ(tab2->GetURL(), page2);
     EXPECT_EQ(host_count, RenderProcessHostCount());
     EXPECT_EQ(tab2->GetRenderProcessHost(), rph2);
 
     // Create another TYPE_WEBUI tab.  It should share the process with newtab.
     // Note: intentionally create this tab after the TYPE_TABBED tabs to
     // exercise bug 43448 where extension and WebUI tabs could get combined into
     // normal renderers.
     GURL history(chrome::kTestHistoryURL);
     chrome::ShowSingletonTab(browser(), history);
     if (browser()->tab_count() == tab_count)
       ui_test_utils::WaitForNewTab(browser());
     tab_count++;
     EXPECT_EQ(tab_count, browser()->tab_count());
-    tab2 = browser()->GetWebContentsAt(tab_count - 1);
+    tab2 = chrome::GetWebContentsAt(browser(), tab_count - 1);
     EXPECT_EQ(tab2->GetURL(), history);
     EXPECT_EQ(host_count, RenderProcessHostCount());
     EXPECT_EQ(tab2->GetRenderProcessHost(), rph1);
 
     // Create a TYPE_EXTENSION tab.  It should be in its own process.
     // (the bookmark manager is implemented as an extension)
     GURL bookmarks(chrome::kTestBookmarksURL);
     chrome::ShowSingletonTab(browser(), bookmarks);
     if (browser()->tab_count() == tab_count)
       ui_test_utils::WaitForNewTab(browser());
     tab_count++;
     host_count++;
     EXPECT_EQ(tab_count, browser()->tab_count());
-    tab1 = browser()->GetWebContentsAt(tab_count - 1);
+    tab1 = chrome::GetWebContentsAt(browser(), tab_count - 1);
     rph3 = tab1->GetRenderProcessHost();
     EXPECT_EQ(tab1->GetURL(), bookmarks);
     EXPECT_EQ(host_count, RenderProcessHostCount());
     EXPECT_NE(rph1, rph3);
     EXPECT_NE(rph2, rph3);
   }
 };
 
 
 class RenderProcessHostTestWithCommandLine : public RenderProcessHostTest {
@@ skipping 96 matching lines @@
   // Set max renderers to 1 to force running out of processes.
   content::RenderProcessHost::SetMaxRendererProcessCount(1);
   TestProcessOverflow();
 }
 
 // Variation of the ProcessOverflow test, which is driven through command line
 // parameter instead of direct function call into the class.
 IN_PROC_BROWSER_TEST_F(RenderProcessHostTestWithCommandLine, ProcessOverflow) {
   TestProcessOverflow();
 }