TabContentsWrapper -> TabContents, part 57.

That's really all.

BUG=131026
TEST=no change

Review URL: https://chromiumcodereview.appspot.com/10539134

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141971 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 127 insertions, 127 deletions

diff --git a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc
index 12380cb..a1f8776 100644
--- a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc
+++ b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc
@@ -41,7 +41,7 @@ class CrossPlatformAccessibilityBrowserTest : public InProcessBrowserTest {
         content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
         content::NotificationService::AllSources());
     content::RenderWidgetHostView* host_view =
-        browser()->GetSelectedWebContents()->GetRenderWidgetHostView();
+        browser()->GetActiveWebContents()->GetRenderWidgetHostView();
     RenderWidgetHostImpl* host =
         RenderWidgetHostImpl::From(host_view->GetRenderWidgetHost());
     RenderViewHostImpl* view_host = static_cast<RenderViewHostImpl*>(host);
diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
index 9693a52..9418dee 100644
--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -84,7 +84,7 @@ class DumpAccessibilityTreeTest : public InProcessBrowserTest {
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        PlatformTreeDifferenceTest) {
   RenderWidgetHostViewPort* host_view = static_cast<RenderWidgetHostViewPort*>(
-          browser()->GetSelectedWebContents()->GetRenderWidgetHostView());
+          browser()->GetActiveWebContents()->GetRenderWidgetHostView());
   RenderWidgetHost* host = host_view->GetRenderWidgetHost();
   RenderViewHostImpl* view_host =
       static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(host));
diff --git a/content/browser/accessibility/renderer_accessibility_browsertest.cc b/content/browser/accessibility/renderer_accessibility_browsertest.cc
index 2688571..698098d 100644
--- a/content/browser/accessibility/renderer_accessibility_browsertest.cc
+++ b/content/browser/accessibility/renderer_accessibility_browsertest.cc
@@ -42,7 +42,7 @@ class RendererAccessibilityBrowserTest : public InProcessBrowserTest {
         content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
         content::NotificationService::AllSources());
     content::RenderWidgetHostView* host_view =
-        browser()->GetSelectedWebContents()->GetRenderWidgetHostView();
+        browser()->GetActiveWebContents()->GetRenderWidgetHostView();
     RenderWidgetHostImpl* host =
         RenderWidgetHostImpl::From(host_view->GetRenderWidgetHost());
     RenderViewHostImpl* view_host = static_cast<RenderViewHostImpl*>(host);
diff --git a/content/browser/device_orientation/device_orientation_browsertest.cc b/content/browser/device_orientation/device_orientation_browsertest.cc
index dec3533..6eabd93 100644
--- a/content/browser/device_orientation/device_orientation_browsertest.cc
+++ b/content/browser/device_orientation/device_orientation_browsertest.cc
@@ -67,7 +67,7 @@ IN_PROC_BROWSER_TEST_F(DeviceOrientationBrowserTest, BasicTest) {
 
   // Check that the page got the event it expected and that the provider
   // saw requests for adding and removing an observer.
-  EXPECT_EQ("pass", browser()->GetSelectedWebContents()->GetURL().ref());
+  EXPECT_EQ("pass", browser()->GetActiveWebContents()->GetURL().ref());
   EXPECT_TRUE(provider->added_observer_);
   EXPECT_TRUE(provider->removed_observer_);
 }
diff --git a/content/browser/dom_storage/dom_storage_browsertest.cc b/content/browser/dom_storage/dom_storage_browsertest.cc
index 0197ba7..f75c6ad 100644
--- a/content/browser/dom_storage/dom_storage_browsertest.cc
+++ b/content/browser/dom_storage/dom_storage_browsertest.cc
@@ -33,11 +33,11 @@ class DomStorageBrowserTest : public InProcessBrowserTest {
     Browser* the_browser = incognito ? CreateIncognitoBrowser() : browser();
     ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
         the_browser, test_url, 2);
-    std::string result = the_browser->GetSelectedWebContents()->GetURL().ref();
+    std::string result = the_browser->GetActiveWebContents()->GetURL().ref();
     if (result != "pass") {
       std::string js_result;
       ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
-          the_browser->GetSelectedWebContents()->GetRenderViewHost(), L"",
+          the_browser->GetActiveWebContents()->GetRenderViewHost(), L"",
           L"window.domAutomationController.send(getLog())", &js_result));
       FAIL() << "Failed: " << js_result;
     }
diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc
index 15440bf..14baaa6 100644
--- a/content/browser/download/mhtml_generation_browsertest.cc
+++ b/content/browser/download/mhtml_generation_browsertest.cc
@@ -56,7 +56,7 @@ IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateMHTML) {
   ui_test_utils::NavigateToURL(browser(),
       test_server()->GetURL("files/google/google.html"));
 
-  WebContents* web_contents = browser()->GetSelectedWebContents();
+  WebContents* web_contents = browser()->GetActiveWebContents();
   web_contents->GenerateMHTML(path,
                               base::Bind(&MHTMLGenerationTest::MHTMLGenerated,
                                          this));
diff --git a/content/browser/download/save_package_browsertest.cc b/content/browser/download/save_package_browsertest.cc
index c46afc6..8f40fcc 100644
--- a/content/browser/download/save_package_browsertest.cc
+++ b/content/browser/download/save_package_browsertest.cc
@@ -40,7 +40,7 @@ IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ImplicitCancel) {
   FilePath full_file_name, dir;
   GetDestinationPaths("a", &full_file_name, &dir);
   scoped_refptr<SavePackage> save_package(new SavePackage(
-      browser()->GetSelectedWebContents(),
+      browser()->GetActiveWebContents(),
       content::SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name, dir));
   ASSERT_TRUE(test_server()->Stop());
 }
@@ -54,7 +54,7 @@ IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ExplicitCancel) {
   FilePath full_file_name, dir;
   GetDestinationPaths("a", &full_file_name, &dir);
   scoped_refptr<SavePackage> save_package(new SavePackage(
-      browser()->GetSelectedWebContents(),
+      browser()->GetActiveWebContents(),
       content::SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name, dir));
   save_package->Cancel(true);
   ASSERT_TRUE(test_server()->Stop());
diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc
index 82c2c4e..5519e5d 100644
--- a/content/browser/fileapi/file_system_browsertest.cc
+++ b/content/browser/fileapi/file_system_browsertest.cc
@@ -40,11 +40,11 @@ class FileSystemBrowserTest : public InProcessBrowserTest {
     ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
         the_browser, test_url, 2);
     LOG(INFO) << "Navigation done.";
-    std::string result = the_browser->GetSelectedWebContents()->GetURL().ref();
+    std::string result = the_browser->GetActiveWebContents()->GetURL().ref();
     if (result != "pass") {
       std::string js_result;
       ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
-          the_browser->GetSelectedWebContents()->GetRenderViewHost(), L"",
+          the_browser->GetActiveWebContents()->GetRenderViewHost(), L"",
           L"window.domAutomationController.send(getLog())", &js_result));
       FAIL() << "Failed: " << js_result;
     }
diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc
index 71c102a..27d67df 100644
--- a/content/browser/in_process_webkit/indexed_db_browsertest.cc
+++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc
@@ -54,11 +54,11 @@ class IndexedDBBrowserTest : public InProcessBrowserTest {
     ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
         the_browser, test_url, 2);
     LOG(INFO) << "Navigation done.";
-    std::string result = the_browser->GetSelectedWebContents()->GetURL().ref();
+    std::string result = the_browser->GetActiveWebContents()->GetURL().ref();
     if (result != "pass") {
       std::string js_result;
       ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
-          the_browser->GetSelectedWebContents()->GetRenderViewHost(), L"",
+          the_browser->GetActiveWebContents()->GetRenderViewHost(), L"",
           L"window.domAutomationController.send(getLog())", &js_result));
       FAIL() << "Failed: " << js_result;
     }
@@ -115,7 +115,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_ValueSizeTest) {
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DoesntHangTest) {
   SimpleTest(GetTestURL(FilePath(
       FILE_PATH_LITERAL("transaction_run_forever.html"))));
-  ui_test_utils::CrashTab(browser()->GetSelectedWebContents());
+  ui_test_utils::CrashTab(browser()->GetActiveWebContents());
   SimpleTest(GetTestURL(FilePath(FILE_PATH_LITERAL("transaction_test.html"))));
 }
 
diff --git a/content/browser/media_browsertest.cc b/content/browser/media_browsertest.cc
index ce142bc..c4e5cb8 100644
--- a/content/browser/media_browsertest.cc
+++ b/content/browser/media_browsertest.cc
@@ -30,7 +30,7 @@ class MediaTest : public InProcessBrowserTest {
     const string16 kFailed = ASCIIToUTF16("FAILED");
     const string16 kError = ASCIIToUTF16("ERROR");
     ui_test_utils::TitleWatcher title_watcher(
-        browser()->GetSelectedWebContents(), kPlaying);
+        browser()->GetActiveWebContents(), kPlaying);
     title_watcher.AlsoWaitForTitle(kFailed);
     title_watcher.AlsoWaitForTitle(kError);
 
diff --git a/content/browser/mouseleave_browsertest.cc b/content/browser/mouseleave_browsertest.cc
index 0309ed8..7257898 100644
--- a/content/browser/mouseleave_browsertest.cc
+++ b/content/browser/mouseleave_browsertest.cc
@@ -31,7 +31,7 @@ IN_PROC_BROWSER_TEST_F(MouseLeaveTest, MAYBE_TestOnMouseOut) {
   GURL test_url = ui_test_utils::GetTestUrl(
       FilePath(), FilePath(FILE_PATH_LITERAL("mouseleave.html")));
 
-  content::WebContents* tab = browser()->GetSelectedWebContents();
+  content::WebContents* tab = browser()->GetActiveWebContents();
   gfx::Rect tab_view_bounds;
   tab->GetView()->GetContainerBounds(&tab_view_bounds);
 
diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc
index 6e704e1..d5d89ba 100644
--- a/content/browser/plugin_browsertest.cc
+++ b/content/browser/plugin_browsertest.cc
@@ -84,7 +84,7 @@ class PluginTest : public InProcessBrowserTest {
   void LoadAndWait(const GURL& url) {
     string16 expected_title(ASCIIToUTF16("OK"));
     ui_test_utils::TitleWatcher title_watcher(
-        browser()->GetSelectedWebContents(), expected_title);
+        browser()->GetActiveWebContents(), expected_title);
     title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
     title_watcher.AlsoWaitForTitle(ASCIIToUTF16("plugin_not_found"));
     ui_test_utils::NavigateToURL(browser(), url);
@@ -175,9 +175,9 @@ IN_PROC_BROWSER_TEST_F(PluginTest,
 
   string16 expected_title(ASCIIToUTF16("OK"));
   ui_test_utils::TitleWatcher title_watcher(
-      browser()->GetSelectedWebContents(), expected_title);
+      browser()->GetActiveWebContents(), expected_title);
   title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
-  ui_test_utils::SimulateMouseClick(browser()->GetSelectedWebContents());
+  ui_test_utils::SimulateMouseClick(browser()->GetActiveWebContents());
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 #endif
@@ -202,7 +202,7 @@ IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginInvokeAlert) {
 
   string16 expected_title(ASCIIToUTF16("OK"));
   ui_test_utils::TitleWatcher title_watcher(
-      browser()->GetSelectedWebContents(), expected_title);
+      browser()->GetActiveWebContents(), expected_title);
   title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
 
   ui_test_utils::WaitForAppModalDialogAndCloseIt();
@@ -399,12 +399,12 @@ IN_PROC_BROWSER_TEST_F(PluginTest, PluginConvertPointTest) {
 
   string16 expected_title(ASCIIToUTF16("OK"));
   ui_test_utils::TitleWatcher title_watcher(
-      browser()->GetSelectedWebContents(), expected_title);
+      browser()->GetActiveWebContents(), expected_title);
   title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
   // TODO(stuartmorgan): When the automation system supports sending clicks,
   // change the test to trigger on mouse-down rather than window focus.
   static_cast<content::WebContentsDelegate*>(browser())->
-      ActivateContents(browser()->GetSelectedWebContents());
+      ActivateContents(browser()->GetActiveWebContents());
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 #endif
diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc
index 9b8f209..9b9d048 100644
--- a/content/browser/renderer_host/render_process_host_browsertest.cc
+++ b/content/browser/renderer_host/render_process_host_browsertest.cc
@@ -44,7 +44,7 @@ class RenderProcessHostTest : public InProcessBrowserTest {
   // handle.
   base::ProcessHandle ShowSingletonTab(const GURL& page) {
     browser()->ShowSingletonTab(page);
-    WebContents* wc = browser()->GetSelectedWebContents();
+    WebContents* wc = browser()->GetActiveWebContents();
     CHECK(wc->GetURL() == page);
 
     // Ensure that the backgrounding / foregrounding gets a chance to run.
diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc
index 71846f9..af4e7d2 100644
--- a/content/browser/renderer_host/render_view_host_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_browsertest.cc
@@ -33,7 +33,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest,
   ui_test_utils::NavigateToURL(browser(), empty_url);
 
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
-      browser()->GetSelectedWebContents()->GetRenderViewHost());
+      browser()->GetActiveWebContents()->GetRenderViewHost());
 
   {
     Value* value = rvh->ExecuteJavascriptAndGetValue(string16(),
@@ -201,7 +201,7 @@ class RenderViewHostTestWebContentsObserver
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) {
   ASSERT_TRUE(test_server()->Start());
   RenderViewHostTestWebContentsObserver observer(
-      browser()->GetSelectedWebContents());
+      browser()->GetActiveWebContents());
 
   GURL test_url = test_server()->GetURL("files/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
@@ -214,7 +214,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) {
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BaseURLParam) {
   ASSERT_TRUE(test_server()->Start());
   RenderViewHostTestWebContentsObserver observer(
-      browser()->GetSelectedWebContents());
+      browser()->GetActiveWebContents());
 
   // Base URL is not set if it is the same as the URL.
   GURL test_url = test_server()->GetURL("files/simple.html");
diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
index 7b3c67a..ee149c8 100644
--- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
@@ -65,7 +65,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) {
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Open a same-site link in a new tab.
@@ -73,7 +73,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) {
       content::Source<content::WebContentsDelegate>(browser())));
   bool success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -84,21 +84,21 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) {
   EXPECT_EQ(1, browser()->active_index());
 
   // Wait for the navigation in the new tab to finish, if it hasn't.
-  ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
+  ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
   EXPECT_EQ("/files/navigate_opener.html",
-            browser()->GetSelectedWebContents()->GetURL().path());
+            browser()->GetActiveWebContents()->GetURL().path());
   EXPECT_EQ(1, browser()->active_index());
 
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> blank_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, blank_site_instance);
 
   // We should have access to the opened tab's location.
   browser()->ActivateTabAt(0, true);
   success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(testScriptAccessToWindow());",
       &success));
   EXPECT_TRUE(success);
@@ -108,14 +108,14 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) {
   ui_test_utils::NavigateToURL(browser(),
                                https_server.GetURL("files/title1.html"));
   scoped_refptr<SiteInstance> new_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_NE(orig_site_instance, new_site_instance);
 
   // We should no longer have script access to the opened tab's location.
   browser()->ActivateTabAt(0, true);
   success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(testScriptAccessToWindow());",
       &success));
   EXPECT_FALSE(success);
@@ -144,13 +144,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a rel=noreferrer + target=blank link.
   bool success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickNoRefTargetBlankLink());",
       &success));
   EXPECT_TRUE(success);
@@ -163,18 +163,18 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
   EXPECT_EQ("/files/title2.html",
-            browser()->GetSelectedWebContents()->GetURL().path());
+            browser()->GetActiveWebContents()->GetURL().path());
 
   // Wait for the cross-site transition in the new tab to finish.
-  ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
+  ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
   WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
-      browser()->GetSelectedWebContents());
+      browser()->GetActiveWebContents());
   EXPECT_FALSE(web_contents->GetRenderManagerForTesting()->
       pending_render_view_host());
 
   // Should have a new SiteInstance.
   scoped_refptr<SiteInstance> noref_blank_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_NE(orig_site_instance, noref_blank_site_instance);
 }
 
@@ -202,13 +202,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a same-site rel=noreferrer + target=foo link.
   bool success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteNoRefTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -221,18 +221,18 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
   EXPECT_EQ("/files/title2.html",
-            browser()->GetSelectedWebContents()->GetURL().path());
+            browser()->GetActiveWebContents()->GetURL().path());
 
   // Wait for the cross-site transition in the new tab to finish.
-  ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
+  ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
   WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
-      browser()->GetSelectedWebContents());
+      browser()->GetActiveWebContents());
   EXPECT_FALSE(web_contents->GetRenderManagerForTesting()->
       pending_render_view_host());
 
   // Should have a new SiteInstance (in a new BrowsingInstance).
   scoped_refptr<SiteInstance> noref_blank_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_NE(orig_site_instance, noref_blank_site_instance);
 }
 
@@ -259,13 +259,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a target=blank link.
   bool success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickTargetBlankLink());",
       &success));
   EXPECT_TRUE(success);
@@ -279,13 +279,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   EXPECT_EQ(1, browser()->active_index());
 
   // Wait for the cross-site transition in the new tab to finish.
-  ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
+  ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
   EXPECT_EQ("/files/title2.html",
-            browser()->GetSelectedWebContents()->GetURL().path());
+            browser()->GetActiveWebContents()->GetURL().path());
 
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> blank_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, blank_site_instance);
 }
 
@@ -312,29 +312,29 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a rel=noreferrer link.
   bool success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickNoRefLink());",
       &success));
   EXPECT_TRUE(success);
 
   // Wait for the cross-site transition in the current tab to finish.
-  ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
+  ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
 
   // Opens in same tab.
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(0, browser()->active_index());
   EXPECT_EQ("/files/title2.html",
-            browser()->GetSelectedWebContents()->GetURL().path());
+            browser()->GetActiveWebContents()->GetURL().path());
 
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> noref_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, noref_site_instance);
 }
 
@@ -361,7 +361,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a target=foo link.
@@ -369,7 +369,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
       content::Source<content::WebContentsDelegate>(browser())));
   bool success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -380,18 +380,18 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   EXPECT_EQ(1, browser()->active_index());
 
   // Wait for the navigation in the new tab to finish, if it hasn't.
-  ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
+  ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
   EXPECT_EQ("/files/navigate_opener.html",
-            browser()->GetSelectedWebContents()->GetURL().path());
+            browser()->GetActiveWebContents()->GetURL().path());
   EXPECT_EQ(1, browser()->active_index());
 
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> blank_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, blank_site_instance);
 
   // Now navigate the new tab to a different site.
-  content::WebContents* new_contents = browser()->GetSelectedWebContents();
+  content::WebContents* new_contents = browser()->GetActiveWebContents();
   ui_test_utils::NavigateToURL(browser(),
                                https_server.GetURL("files/title1.html"));
   scoped_refptr<SiteInstance> new_site_instance(
@@ -405,7 +405,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
         content::Source<content::NavigationController>(
             &new_contents->GetController()));
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -414,7 +414,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Should have swapped back and shown the new tab again.
   EXPECT_EQ(1, browser()->active_index());
   scoped_refptr<SiteInstance> revisit_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, revisit_site_instance);
 
   // If it navigates away to another process, the original window should
@@ -422,13 +422,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   ui_test_utils::NavigateToURL(browser(),
                                https_server.GetURL("files/title1.html"));
   EXPECT_EQ(new_site_instance,
-            browser()->GetSelectedWebContents()->GetSiteInstance());
+            browser()->GetActiveWebContents()->GetSiteInstance());
   browser()->ActivateTabAt(0, true);
   ui_test_utils::WindowedNotificationObserver close_observer(
         content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
         content::Source<content::WebContents>(new_contents));
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(testCloseWindow());",
       &success));
   EXPECT_TRUE(success);
@@ -462,7 +462,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
                                test_server()->GetURL(replacement_path));
 
   // Get the original SiteInstance and RVHM for later comparison.
-  content::WebContents* opener_contents = browser()->GetSelectedWebContents();
+  content::WebContents* opener_contents = browser()->GetActiveWebContents();
   scoped_refptr<SiteInstance> orig_site_instance(
       opener_contents->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
@@ -486,7 +486,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
   // Wait for the navigation in the new tab to finish, if it hasn't, then
   // send it to post_message.html on a different site.
-  content::WebContents* foo_contents = browser()->GetSelectedWebContents();
+  content::WebContents* foo_contents = browser()->GetActiveWebContents();
   ui_test_utils::WaitForLoadStop(foo_contents);
   EXPECT_EQ("/files/navigate_opener.html", foo_contents->GetURL().path());
   EXPECT_EQ(1, browser()->active_index());
@@ -501,7 +501,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   ui_test_utils::WindowedTabAddedNotificationObserver new_tab_observer2((
       content::Source<content::WebContentsDelegate>(browser())));
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetBlankLink());",
       &success));
   EXPECT_TRUE(success);
@@ -509,7 +509,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
   // Wait for the navigation in the new tab to finish, if it hasn't, then
   // send it to post_message.html on the original site.
-  content::WebContents* new_contents = browser()->GetSelectedWebContents();
+  content::WebContents* new_contents = browser()->GetActiveWebContents();
   ui_test_utils::WaitForLoadStop(new_contents);
   EXPECT_EQ("/files/title2.html", new_contents->GetURL().path());
   EXPECT_EQ(1, browser()->active_index());
@@ -603,9 +603,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
                                test_server()->GetURL(replacement_path));
 
   // Get the original tab and SiteInstance for later comparison.
-  content::WebContents* orig_contents = browser()->GetSelectedWebContents();
+  content::WebContents* orig_contents = browser()->GetActiveWebContents();
   scoped_refptr<SiteInstance> orig_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a target=foo link.
@@ -613,7 +613,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
       content::Source<content::WebContentsDelegate>(browser())));
   bool success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -624,14 +624,14 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   EXPECT_EQ(1, browser()->active_index());
 
   // Wait for the navigation in the new tab to finish, if it hasn't.
-  ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
+  ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
   EXPECT_EQ("/files/navigate_opener.html",
-            browser()->GetSelectedWebContents()->GetURL().path());
+            browser()->GetActiveWebContents()->GetURL().path());
   EXPECT_EQ(1, browser()->active_index());
 
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> blank_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, blank_site_instance);
 
   // Now navigate the original (opener) tab to a different site.
@@ -639,7 +639,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   ui_test_utils::NavigateToURL(browser(),
                                https_server.GetURL("files/title1.html"));
   scoped_refptr<SiteInstance> new_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_NE(orig_site_instance, new_site_instance);
 
   // The opened tab should be able to navigate the opener back to its process.
@@ -649,7 +649,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
         content::Source<content::NavigationController>(
             &orig_contents->GetController()));
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(navigateOpener());",
       &success));
   EXPECT_TRUE(success);
@@ -661,7 +661,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Should have swapped back into this process.
   browser()->ActivateTabAt(0, true);
   scoped_refptr<SiteInstance> revisit_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, revisit_site_instance);
 }
 
@@ -689,7 +689,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a target=foo link.
@@ -697,7 +697,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
       content::Source<content::WebContentsDelegate>(browser())));
   bool success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -708,21 +708,21 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   EXPECT_EQ(1, browser()->active_index());
 
   // Wait for the navigation in the new tab to finish, if it hasn't.
-  ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
+  ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
   EXPECT_EQ("/files/navigate_opener.html",
-            browser()->GetSelectedWebContents()->GetURL().path());
+            browser()->GetActiveWebContents()->GetURL().path());
   EXPECT_EQ(1, browser()->active_index());
 
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> opened_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, opened_site_instance);
 
   // Now navigate the opened tab to a different site.
   ui_test_utils::NavigateToURL(browser(),
                                https_server.GetURL("files/title1.html"));
   scoped_refptr<SiteInstance> new_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_NE(orig_site_instance, new_site_instance);
 
   // The original process should still be alive, since it is still used in the
@@ -740,7 +740,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
                                https_server.GetURL("files/title1.html"));
   exit_observer.Wait();
   scoped_refptr<SiteInstance> new_site_instance2(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_EQ(new_site_instance, new_site_instance2);
 }
 
@@ -767,7 +767,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) {
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Load a cross-site page that fails with a 204 error.
@@ -775,31 +775,31 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) {
 
   // We should still be looking at the normal page.
   scoped_refptr<SiteInstance> post_nav_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, post_nav_site_instance);
   EXPECT_EQ("/files/click-noreferrer-links.html",
-            browser()->GetSelectedWebContents()->GetURL().path());
+            browser()->GetActiveWebContents()->GetURL().path());
 
   // Renderer-initiated navigations should work.
   bool success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickNoRefLink());",
       &success));
   EXPECT_TRUE(success);
 
   // Wait for the cross-site transition in the current tab to finish.
-  ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
+  ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
 
   // Opens in same tab.
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(0, browser()->active_index());
   EXPECT_EQ("/files/title2.html",
-            browser()->GetSelectedWebContents()->GetURL().path());
+            browser()->GetActiveWebContents()->GetURL().path());
 
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> noref_site_instance(
-      browser()->GetSelectedWebContents()->GetSiteInstance());
+      browser()->GetActiveWebContents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, noref_site_instance);
 }
 
@@ -848,7 +848,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, BackForwardNotStale) {
                                https_server.GetURL(replacement_path_b3));
 
   // History is now [blank, A1, B1, B2, *B3].
-  content::WebContents* contents = browser()->GetSelectedWebContents();
+  content::WebContents* contents = browser()->GetActiveWebContents();
   EXPECT_EQ(5, contents->GetController().GetEntryCount());
 
   // Open another tab in same process to keep this process alive.
@@ -955,7 +955,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
       content::Source<content::WebContentsDelegate>(browser())));
   bool success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
+      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
@@ -966,13 +966,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   EXPECT_EQ(1, browser()->active_index());
 
   // Wait for the navigation in the new tab to finish, if it hasn't.
-  ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
+  ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
   EXPECT_EQ("/files/navigate_opener.html",
-            browser()->GetSelectedWebContents()->GetURL().path());
+            browser()->GetActiveWebContents()->GetURL().path());
   EXPECT_EQ(1, browser()->active_index());
 
   RenderViewHost* rvh =
-      browser()->GetSelectedWebContents()->GetRenderViewHost();
+      browser()->GetActiveWebContents()->GetRenderViewHost();
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       rvh, L"",
       L"window.domAutomationController.send("
@@ -999,16 +999,16 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
     ui_test_utils::WindowedNotificationObserver back_nav_load_observer(
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<content::NavigationController>(
-            &browser()->GetSelectedWebContents()->GetController()));
+            &browser()->GetActiveWebContents()->GetController()));
     browser()->GoBack(CURRENT_TAB);
     back_nav_load_observer.Wait();
   }
 
 
   EXPECT_EQ("/files/navigate_opener.html",
-            browser()->GetSelectedWebContents()->GetURL().path());
+            browser()->GetActiveWebContents()->GetURL().path());
 
-  EXPECT_EQ(rvh, browser()->GetSelectedWebContents()->GetRenderViewHost());
+  EXPECT_EQ(rvh, browser()->GetActiveWebContents()->GetRenderViewHost());
 
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       rvh, L"",
@@ -1083,20 +1083,20 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, LeakingRenderViewHosts) {
   // was a problem.  This is no longer the case.
   GURL navigated_url(test_server()->GetURL("files/title2.html"));
   ui_test_utils::NavigateToURL(browser(), navigated_url);
-  SiteInstance* site_instance1 = browser()->GetSelectedWebContents()->
+  SiteInstance* site_instance1 = browser()->GetActiveWebContents()->
       GetRenderViewHost()->GetSiteInstance();
 
   // Observe the newly created render_view_host to make sure it will not leak.
   RenderViewHostObserverArray rvh_observers;
-  rvh_observers.AddObserverToRVH(browser()->GetSelectedWebContents()->
+  rvh_observers.AddObserverToRVH(browser()->GetActiveWebContents()->
       GetRenderViewHost());
 
   GURL view_source_url(chrome::kViewSourceScheme + std::string(":") +
       navigated_url.spec());
   ui_test_utils::NavigateToURL(browser(), view_source_url);
-  rvh_observers.AddObserverToRVH(browser()->GetSelectedWebContents()->
+  rvh_observers.AddObserverToRVH(browser()->GetActiveWebContents()->
       GetRenderViewHost());
-  SiteInstance* site_instance2 = browser()->GetSelectedWebContents()->
+  SiteInstance* site_instance2 = browser()->GetActiveWebContents()->
       GetRenderViewHost()->GetSiteInstance();
 
   // Ensure that view-source navigations force a new SiteInstance.
@@ -1105,10 +1105,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, LeakingRenderViewHosts) {
   // Now navigate to a different instance so that we swap out again.
   ui_test_utils::NavigateToURL(browser(),
                                https_server.GetURL("files/title2.html"));
-  rvh_observers.AddObserverToRVH(browser()->GetSelectedWebContents()->
+  rvh_observers.AddObserverToRVH(browser()->GetActiveWebContents()->
       GetRenderViewHost());
 
   // This used to leak a render view host.
-  browser()->CloseTabContents(browser()->GetSelectedWebContents());
+  browser()->CloseTabContents(browser()->GetActiveWebContents());
   EXPECT_EQ(0U, rvh_observers.GetNumObservers());
 }
diff --git a/content/browser/renderer_host/resource_dispatcher_host_browsertest.cc b/content/browser/renderer_host/resource_dispatcher_host_browsertest.cc
index 4bda0a53..10490fa 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_browsertest.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host_browsertest.cc
@@ -76,7 +76,7 @@ class ResourceDispatcherHostBrowserTest : public InProcessBrowserTest,
   }
 
   content::RenderViewHost* render_view_host() {
-    return browser()->GetSelectedWebContents()->GetRenderViewHost();
+    return browser()->GetActiveWebContents()->GetRenderViewHost();
   }
 
   GURL GetMockURL(const std::string& file) {
@@ -88,7 +88,7 @@ class ResourceDispatcherHostBrowserTest : public InProcessBrowserTest,
                       int expected_navigations) {
     string16 expected_title16(ASCIIToUTF16(expected_title));
     ui_test_utils::TitleWatcher title_watcher(
-        browser()->GetSelectedWebContents(), expected_title16);
+        browser()->GetActiveWebContents(), expected_title16);
     ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
         browser(), url, expected_navigations);
     EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
@@ -217,7 +217,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, SyncXMLHttpRequest) {
   // Let's check the XMLHttpRequest ran successfully.
   bool success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       L"",
       L"window.domAutomationController.send(DidSyncRequestSucceed());",
       &success));
@@ -235,7 +235,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
   // Let's check the XMLHttpRequest ran successfully.
   bool success = false;
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       L"",
       L"window.domAutomationController.send(DidSucceed());",
       &success));
@@ -386,7 +386,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
       browser(), failed_url, 2);
 
   EXPECT_NE(ASCIIToUTF16("set cookie on unload"),
-            browser()->GetSelectedWebContents()->GetTitle());
+            browser()->GetActiveWebContents()->GetTitle());
 
   // Check that the cookie was set, meaning that the onunload handler ran.
   EXPECT_EQ("onunloadCookie=foo", GetCookies(url));
@@ -402,7 +402,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
   // off the navigation, and wait to see that the tab loads.
   string16 expected_title16(ASCIIToUTF16("Title Of Awesomeness"));
   ui_test_utils::TitleWatcher title_watcher(
-      browser()->GetSelectedWebContents(), expected_title16);
+      browser()->GetActiveWebContents(), expected_title16);
 
   bool success;
   GURL test_url(test_server()->GetURL("files/title2.html"));
@@ -410,7 +410,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
       test_url.possibly_invalid_spec() + "';" +
       "window.domAutomationController.send(true);";
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       L"", ASCIIToWide(redirect_script), &success));
   EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
 }
diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc
index 74d94e3..5544bed 100644
--- a/content/browser/session_history_browsertest.cc
+++ b/content/browser/session_history_browsertest.cc
@@ -54,11 +54,11 @@ class SessionHistoryTest : public InProcessBrowserTest {
   }
 
   std::string GetTabTitle() {
-    return UTF16ToASCII(browser()->GetSelectedWebContents()->GetTitle());
+    return UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle());
   }
 
   GURL GetTabURL() {
-    return browser()->GetSelectedWebContents()->GetURL();
+    return browser()->GetActiveWebContents()->GetURL();
   }
 
   GURL GetURL(const std::string file) {
@@ -69,7 +69,7 @@ class SessionHistoryTest : public InProcessBrowserTest {
                              const std::string& expected_title) {
     string16 expected_title16(ASCIIToUTF16(expected_title));
     ui_test_utils::TitleWatcher title_watcher(
-        browser()->GetSelectedWebContents(), expected_title16);
+        browser()->GetActiveWebContents(), expected_title16);
     ui_test_utils::NavigateToURL(browser(), GetURL(filename));
     ASSERT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
@@ -434,14 +434,14 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, LocationChangeInSubframe) {
 IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {
   int length;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(1, length);
 
   ui_test_utils::NavigateToURL(browser(), GetURL("title1.html"));
 
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(2, length);
 
@@ -449,7 +449,7 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {
   ui_test_utils::NavigateToURL(browser(), GetURL("record_length.html"));
 
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(3, length);
 
@@ -460,7 +460,7 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {
   ui_test_utils::NavigateToURL(browser(), GetURL("title2.html"));
 
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(2, length);
 }
diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc
index f812ebf..bdd3843 100644
--- a/content/browser/speech/speech_recognition_browsertest.cc
+++ b/content/browser/speech/speech_recognition_browsertest.cc
@@ -202,7 +202,7 @@ class SpeechRecognitionBrowserTest : public InProcessBrowserTest {
     mouse_event.x = 0;
     mouse_event.y = 0;
     mouse_event.clickCount = 1;
-    WebContents* web_contents = browser()->GetSelectedWebContents();
+    WebContents* web_contents = browser()->GetActiveWebContents();
 
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
@@ -225,7 +225,7 @@ class SpeechRecognitionBrowserTest : public InProcessBrowserTest {
     // then sets the URL fragment as 'pass' if it received the expected string.
     LoadAndStartSpeechRecognitionTest(filename);
 
-    EXPECT_EQ("pass", browser()->GetSelectedWebContents()->GetURL().ref());
+    EXPECT_EQ("pass", browser()->GetActiveWebContents()->GetURL().ref());
   }
 
   // InProcessBrowserTest methods.
diff --git a/content/browser/webkit_browsertest.cc b/content/browser/webkit_browsertest.cc
index 7035596..a024d94 100644
--- a/content/browser/webkit_browsertest.cc
+++ b/content/browser/webkit_browsertest.cc
@@ -28,7 +28,7 @@ IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, AbortOnEnd) {
 
   ui_test_utils::NavigateToURL(browser(), url);
 
-  WebContents* web_contents = browser()->GetSelectedWebContents();
+  WebContents* web_contents = browser()->GetActiveWebContents();
   // If you are seeing this test fail, please strongly investigate the
   // possibility that http://crbug.com/75604 and
   // https://bugs.webkit.org/show_bug.cgi?id=71122 have reverted before
@@ -52,6 +52,6 @@ IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, XsltBadImport) {
 
   ui_test_utils::NavigateToURL(browser(), url);
 
-  WebContents* web_contents = browser()->GetSelectedWebContents();
+  WebContents* web_contents = browser()->GetActiveWebContents();
   EXPECT_FALSE(web_contents->IsCrashed());
 }
diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc
index e3f2bb8..c838dae 100644
--- a/content/browser/worker_host/test/worker_browsertest.cc
+++ b/content/browser/worker_host/test/worker_browsertest.cc
@@ -287,7 +287,7 @@ class WorkerTest : public InProcessBrowserTest {
     GURL url = GetTestURL(test_case, query);
     const string16 expected_title = ASCIIToUTF16("OK");
     ui_test_utils::TitleWatcher title_watcher(
-        browser->GetSelectedWebContents(), expected_title);
+        browser->GetActiveWebContents(), expected_title);
     ui_test_utils::NavigateToURL(browser, url);
     string16 final_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, final_title);
diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc
index 469a45a..1d23291 100644
--- a/content/test/layout_browsertest.cc
+++ b/content/test/layout_browsertest.cc
@@ -186,7 +186,7 @@ void InProcessBrowserLayoutTest::RunLayoutTestInternal(
   LOG(INFO) << "Navigating to URL " << url << " and blocking.";
   const string16 expected_title = ASCIIToUTF16("done");
   ui_test_utils::TitleWatcher title_watcher(
-      browser()->GetSelectedWebContents(), expected_title);
+      browser()->GetActiveWebContents(), expected_title);
   ui_test_utils::NavigateToURL(browser(), url);
   LOG(INFO) << "Navigation completed, now waiting for title.";
   string16 final_title = title_watcher.WaitAndGetTitle();