Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/extensions/app_process_apitest.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 "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/process_map.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/string_ordinal.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 50 matching lines @@
 
     // Test both opening a URL in a new tab, and opening a tab and then
     // navigating it.  Either way, app tabs should be considered extension
     // processes, but they have no elevated privileges and thus should not
     // have WebUI bindings.
     ui_test_utils::NavigateToURLWithDisposition(
         browser(), base_url.Resolve("path1/empty.html"), NEW_FOREGROUND_TAB,
         ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
     LOG(INFO) << "Nav 1.";
     EXPECT_TRUE(process_map->Contains(
-        browser()->GetWebContentsAt(1)->GetRenderProcessHost()->GetID()));
-    EXPECT_FALSE(browser()->GetWebContentsAt(1)->GetWebUI());
+      chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost()->GetID()));
+    EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 1)->GetWebUI());
 
     ui_test_utils::WindowedNotificationObserver tab_added_observer(
         chrome::NOTIFICATION_TAB_ADDED,
         content::NotificationService::AllSources());
     chrome::NewTab(browser());
     tab_added_observer.Wait();
     LOG(INFO) << "New tab.";
     ui_test_utils::NavigateToURL(browser(),
                                  base_url.Resolve("path2/empty.html"));
     LOG(INFO) << "Nav 2.";
     EXPECT_TRUE(process_map->Contains(
-        browser()->GetWebContentsAt(2)->GetRenderProcessHost()->GetID()));
-    EXPECT_FALSE(browser()->GetWebContentsAt(2)->GetWebUI());
+        chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()->GetID()));
+    EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 2)->GetWebUI());
 
     // We should have opened 2 new extension tabs. Including the original blank
     // tab, we now have 3 tabs. The two app tabs should not be in the same
     // process, since they do not have the background permission.  (Thus, we
     // want to separate them to improve responsiveness.)
     ASSERT_EQ(3, browser()->tab_count());
-    WebContents* tab1 = browser()->GetWebContentsAt(1);
-    WebContents* tab2 = browser()->GetWebContentsAt(2);
+    WebContents* tab1 = chrome::GetWebContentsAt(browser(), 1);
+    WebContents* tab2 = chrome::GetWebContentsAt(browser(), 2);
     EXPECT_NE(tab1->GetRenderProcessHost(), tab2->GetRenderProcessHost());
 
     // Opening tabs with window.open should keep the page in the opener's
     // process.
     ASSERT_EQ(1u, browser::GetBrowserCount(browser()->profile()));
     OpenWindow(tab1, base_url.Resolve("path1/empty.html"), true, NULL);
     LOG(INFO) << "WindowOpenHelper 1.";
     OpenWindow(tab2, base_url.Resolve("path2/empty.html"), true, NULL);
     LOG(INFO) << "End of test.";
   }
@@ skipping 17 matching lines @@
   // Open two tabs in the app, one outside it.
   GURL base_url = GetTestBaseURL("app_process");
 
   // Test both opening a URL in a new tab, and opening a tab and then navigating
   // it.  Either way, app tabs should be considered extension processes, but
   // they have no elevated privileges and thus should not have WebUI bindings.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("path1/empty.html"), NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   EXPECT_TRUE(process_map->Contains(
-      browser()->GetWebContentsAt(1)->GetRenderProcessHost()->GetID()));
-  EXPECT_FALSE(browser()->GetWebContentsAt(1)->GetWebUI());
+      chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost()->GetID()));
+  EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 1)->GetWebUI());
   LOG(INFO) << "Nav 1.";
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("path2/empty.html"), NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   EXPECT_TRUE(process_map->Contains(
-      browser()->GetWebContentsAt(2)->GetRenderProcessHost()->GetID()));
-  EXPECT_FALSE(browser()->GetWebContentsAt(2)->GetWebUI());
+      chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()->GetID()));
+  EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 2)->GetWebUI());
   LOG(INFO) << "Nav 2.";
 
   ui_test_utils::WindowedNotificationObserver tab_added_observer(
       chrome::NOTIFICATION_TAB_ADDED,
       content::NotificationService::AllSources());
   chrome::NewTab(browser());
   tab_added_observer.Wait();
   LOG(INFO) << "New tab.";
   ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path3/empty.html"));
   LOG(INFO) << "Nav 3.";
   EXPECT_FALSE(process_map->Contains(
-      browser()->GetWebContentsAt(3)->GetRenderProcessHost()->GetID()));
-  EXPECT_FALSE(browser()->GetWebContentsAt(3)->GetWebUI());
+      chrome::GetWebContentsAt(browser(), 3)->GetRenderProcessHost()->GetID()));
+  EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 3)->GetWebUI());
 
   // We should have opened 3 new extension tabs. Including the original blank
   // tab, we now have 4 tabs. Because the app_process app has the background
   // permission, all of its instances are in the same process.  Thus two tabs
   // should be part of the extension app and grouped in the same process.
   ASSERT_EQ(4, browser()->tab_count());
-  WebContents* tab = browser()->GetWebContentsAt(1);
+  WebContents* tab = chrome::GetWebContentsAt(browser(), 1);
 
   EXPECT_EQ(tab->GetRenderProcessHost(),
-            browser()->GetWebContentsAt(2)->GetRenderProcessHost());
+            chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost());
   EXPECT_NE(tab->GetRenderProcessHost(),
-            browser()->GetWebContentsAt(3)->GetRenderProcessHost());
+            chrome::GetWebContentsAt(browser(), 3)->GetRenderProcessHost());
 
   // Now let's do the same using window.open. The same should happen.
   ASSERT_EQ(1u, browser::GetBrowserCount(browser()->profile()));
   OpenWindow(tab, base_url.Resolve("path1/empty.html"), true, NULL);
   LOG(INFO) << "WindowOpenHelper 1.";
   OpenWindow(tab, base_url.Resolve("path2/empty.html"), true, NULL);
   LOG(INFO) << "WindowOpenHelper 2.";
   // TODO(creis): This should open in a new process (i.e., false for the last
   // argument), but we temporarily avoid swapping processes away from a hosted
   // app if it has an opener, because some OAuth providers make script calls
   // between non-app popups and non-app iframes in the app process.
   // See crbug.com/59285.
   OpenWindow(tab, base_url.Resolve("path3/empty.html"), true, NULL);
   LOG(INFO) << "WindowOpenHelper 3.";
 
   // Now let's have these pages navigate, into or out of the extension web
   // extent. They should switch processes.
   const GURL& app_url(base_url.Resolve("path1/empty.html"));
   const GURL& non_app_url(base_url.Resolve("path3/empty.html"));
-  NavigateInRenderer(browser()->GetWebContentsAt(2), non_app_url);
+  NavigateInRenderer(chrome::GetWebContentsAt(browser(), 2), non_app_url);
   LOG(INFO) << "NavigateTabHelper 1.";
-  NavigateInRenderer(browser()->GetWebContentsAt(3), app_url);
+  NavigateInRenderer(chrome::GetWebContentsAt(browser(), 3), app_url);
   LOG(INFO) << "NavigateTabHelper 2.";
   EXPECT_NE(tab->GetRenderProcessHost(),
-            browser()->GetWebContentsAt(2)->GetRenderProcessHost());
+            chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost());
   EXPECT_EQ(tab->GetRenderProcessHost(),
-            browser()->GetWebContentsAt(3)->GetRenderProcessHost());
+            chrome::GetWebContentsAt(browser(), 3)->GetRenderProcessHost());
 
   // If one of the popup tabs navigates back to the app, window.opener should
   // be valid.
-  NavigateInRenderer(browser()->GetWebContentsAt(6), app_url);
+  NavigateInRenderer(chrome::GetWebContentsAt(browser(), 6), app_url);
   LOG(INFO) << "NavigateTabHelper 3.";
   EXPECT_EQ(tab->GetRenderProcessHost(),
-            browser()->GetWebContentsAt(6)->GetRenderProcessHost());
+            chrome::GetWebContentsAt(browser(), 6)->GetRenderProcessHost());
   bool windowOpenerValid = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetWebContentsAt(6)->GetRenderViewHost(), L"",
+      chrome::GetWebContentsAt(browser(), 6)->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(window.opener != null)",
       &windowOpenerValid));
   ASSERT_TRUE(windowOpenerValid);
 
   LOG(INFO) << "End of test.";
 }
 
 // Test that hosted apps without the background permission use a process per app
 // instance model, such that separate instances are in separate processes.
 IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessInstances) {
@@ skipping 29 matching lines @@
   ASSERT_TRUE(extension.get());
   ASSERT_TRUE(extension->from_bookmark());
 
   // Test both opening a URL in a new tab, and opening a tab and then navigating
   // it.  Either way, bookmark app tabs should be considered normal processes
   // with no elevated privileges and no WebUI bindings.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("path1/empty.html"), NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   EXPECT_FALSE(process_map->Contains(
-      browser()->GetWebContentsAt(1)->GetRenderProcessHost()->GetID()));
-  EXPECT_FALSE(browser()->GetWebContentsAt(1)->GetWebUI());
+      chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost()->GetID()));
+  EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 1)->GetWebUI());
 
   ui_test_utils::WindowedNotificationObserver tab_added_observer(
       chrome::NOTIFICATION_TAB_ADDED,
       content::NotificationService::AllSources());
   chrome::NewTab(browser());
   tab_added_observer.Wait();
   ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path2/empty.html"));
   EXPECT_FALSE(process_map->Contains(
-      browser()->GetWebContentsAt(2)->GetRenderProcessHost()->GetID()));
-  EXPECT_FALSE(browser()->GetWebContentsAt(2)->GetWebUI());
+      chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()->GetID()));
+  EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 2)->GetWebUI());
 
   // We should have opened 2 new bookmark app tabs. Including the original blank
   // tab, we now have 3 tabs.  Because normal pages use the
   // process-per-site-instance model, each should be in its own process.
   ASSERT_EQ(3, browser()->tab_count());
-  WebContents* tab = browser()->GetWebContentsAt(1);
+  WebContents* tab = chrome::GetWebContentsAt(browser(), 1);
   EXPECT_NE(tab->GetRenderProcessHost(),
-            browser()->GetWebContentsAt(2)->GetRenderProcessHost());
+            chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost());
 
   // Now let's do the same using window.open. The same should happen.
   ASSERT_EQ(1u, browser::GetBrowserCount(browser()->profile()));
   OpenWindow(tab, base_url.Resolve("path1/empty.html"), true, NULL);
   OpenWindow(tab, base_url.Resolve("path2/empty.html"), true, NULL);
 
   // Now let's have a tab navigate out of and back into the app's web
   // extent. Neither navigation should switch processes.
   const GURL& app_url(base_url.Resolve("path1/empty.html"));
   const GURL& non_app_url(base_url.Resolve("path3/empty.html"));
-  RenderViewHost* host2 = browser()->GetWebContentsAt(2)->GetRenderViewHost();
-  NavigateInRenderer(browser()->GetWebContentsAt(2), non_app_url);
+  RenderViewHost* host2 =
+      chrome::GetWebContentsAt(browser(), 2)->GetRenderViewHost();
+  NavigateInRenderer(chrome::GetWebContentsAt(browser(), 2), non_app_url);
   EXPECT_EQ(host2->GetProcess(),
-            browser()->GetWebContentsAt(2)->GetRenderProcessHost());
-  NavigateInRenderer(browser()->GetWebContentsAt(2), app_url);
+            chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost());
+  NavigateInRenderer(chrome::GetWebContentsAt(browser(), 2), app_url);
   EXPECT_EQ(host2->GetProcess(),
-            browser()->GetWebContentsAt(2)->GetRenderProcessHost());
+            chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost());
 }
 
 // Tests that app process switching works properly in the following scenario:
 // 1. navigate to a page1 in the app
 // 2. page1 redirects to a page2 outside the app extent (ie, "/server-redirect")
 // 3. page2 redirects back to a page in the app
 // The final navigation should end up in the app process.
 // See http://crbug.com/61757
 IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessRedirectBack) {
   host_resolver()->AddRule("*", "127.0.0.1");
@@ skipping 17 matching lines @@
   //    transfers that to a new navigation, using RequestTransferURL.
   // 6. Renderer navigates to empty.html, and finishes loading, counting as the
   //    second load stop
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(), base_url.Resolve("path1/redirect.html"), 2);
 
   // 3 tabs, including the initial about:blank. The last 2 should be the same
   // process.
   ASSERT_EQ(3, browser()->tab_count());
   EXPECT_EQ("/files/extensions/api_test/app_process/path1/empty.html",
-            browser()->GetWebContentsAt(2)->GetController().
+            chrome::GetWebContentsAt(browser(), 2)->GetController().
                 GetLastCommittedEntry()->GetURL().path());
-  EXPECT_EQ(browser()->GetWebContentsAt(1)->GetRenderProcessHost(),
-            browser()->GetWebContentsAt(2)->GetRenderProcessHost());
+  EXPECT_EQ(chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost(),
+            chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost());
 }
 
 // Ensure that reloading a URL after installing or uninstalling it as an app
 // correctly swaps the process.  (http://crbug.com/80621)
 //
 // The test times out under AddressSanitizer, see http://crbug.com/103371
 #if defined(ADDRESS_SANITIZER)
 #define MAYBE_ReloadIntoAppProcess DISABLED_ReloadIntoAppProcess
 #else
 #define MAYBE_ReloadIntoAppProcess ReloadIntoAppProcess
 #endif
 IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) {
   extensions::ProcessMap* process_map =
       browser()->profile()->GetExtensionService()->process_map();
 
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
   // The app under test acts on URLs whose host is "localhost",
   // so the URLs we navigate to must have host "localhost".
   GURL base_url = GetTestBaseURL("app_process");
 
   // Load an app URL before loading the app.
   ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path1/empty.html"));
-  WebContents* contents = browser()->GetWebContentsAt(0);
+  WebContents* contents = chrome::GetWebContentsAt(browser(), 0);
   EXPECT_FALSE(process_map->Contains(
       contents->GetRenderProcessHost()->GetID()));
 
   // Load app and navigate to the page.
   const Extension* app =
       LoadExtension(test_data_dir_.AppendASCII("app_process"));
   ASSERT_TRUE(app);
   ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path1/empty.html"));
   EXPECT_TRUE(process_map->Contains(
       contents->GetRenderProcessHost()->GetID()));
 
   // Disable app and navigate to the page.
   DisableExtension(app->id());
   ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path1/empty.html"));
   EXPECT_FALSE(process_map->Contains(
       contents->GetRenderProcessHost()->GetID()));
 
   // Enable app and reload the page.
   EnableExtension(app->id());
   ui_test_utils::WindowedNotificationObserver reload_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
-          &browser()->GetActiveWebContents()->GetController()));
+          &chrome::GetActiveWebContents(browser())->GetController()));
   chrome::Reload(browser(), CURRENT_TAB);
   reload_observer.Wait();
   EXPECT_TRUE(process_map->Contains(
       contents->GetRenderProcessHost()->GetID()));
 
   // Disable app and reload the page.
   DisableExtension(app->id());
   ui_test_utils::WindowedNotificationObserver reload_observer2(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
-          &browser()->GetActiveWebContents()->GetController()));
+          &chrome::GetActiveWebContents(browser())->GetController()));
   chrome::Reload(browser(), CURRENT_TAB);
   reload_observer2.Wait();
   EXPECT_FALSE(process_map->Contains(
       contents->GetRenderProcessHost()->GetID()));
 
   // Enable app and reload via JavaScript.
   EnableExtension(app->id());
   ui_test_utils::WindowedNotificationObserver js_reload_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
-          &browser()->GetActiveWebContents()->GetController()));
+          &chrome::GetActiveWebContents(browser())->GetController()));
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(contents->GetRenderViewHost(),
                                                L"", L"location.reload();"));
   js_reload_observer.Wait();
   EXPECT_TRUE(process_map->Contains(
       contents->GetRenderProcessHost()->GetID()));
 
   // Disable app and reload via JavaScript.
   DisableExtension(app->id());
   ui_test_utils::WindowedNotificationObserver js_reload_observer2(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
-          &browser()->GetActiveWebContents()->GetController()));
+          &chrome::GetActiveWebContents(browser())->GetController()));
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(contents->GetRenderViewHost(),
                                                L"", L"location = location;"));
   js_reload_observer2.Wait();
   EXPECT_FALSE(process_map->Contains(
       contents->GetRenderProcessHost()->GetID()));
 }
 
 // Tests that if we have a non-app process (path3/container.html) that has an
 // iframe with  a URL in the app's extent (path1/iframe.html), then opening a
 // link from that iframe to a new window to a URL in the app's extent (path1/
@@ skipping 12 matching lines @@
   const Extension* app =
       LoadExtension(test_data_dir_.AppendASCII("app_process"));
   ASSERT_TRUE(app);
 
   ui_test_utils::WindowedNotificationObserver popup_observer(
         content::NOTIFICATION_RENDER_VIEW_HOST_CREATED,
         content::NotificationService::AllSources());
   ui_test_utils::NavigateToURL(browser(),
                                base_url.Resolve("path3/container.html"));
   EXPECT_FALSE(process_map->Contains(
-      browser()->GetWebContentsAt(0)->GetRenderProcessHost()->GetID()));
+      chrome::GetWebContentsAt(browser(), 0)->GetRenderProcessHost()->GetID()));
   popup_observer.Wait();
 
   // Popup window should be in the app's process.
   RenderViewHost* popup_host =
       content::Source<RenderViewHost>(popup_observer.source()).ptr();
   EXPECT_TRUE(process_map->Contains(popup_host->GetProcess()->GetID()));
 }
 
 // Tests that if an extension launches an app via chrome.tabs.create with an URL
 // that's not in the app's extent but that redirects to it, we still end up with
@@ skipping 24 matching lines @@
 
   // Wait for app tab to be created and loaded.
   test_navigation_observer.WaitForObservation(
       base::Bind(&ui_test_utils::RunMessageLoop),
       base::Bind(&MessageLoop::Quit,
                  base::Unretained(MessageLoopForUI::current())));
 
   // App has loaded, and chrome.app.isInstalled should be true.
   bool is_installed = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-      browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(chrome.app.isInstalled)",
       &is_installed));
   ASSERT_TRUE(is_installed);
 }
 
 // Tests that if we have an app process (path1/container.html) with a non-app
 // iframe (path3/iframe.html), then opening a link from that iframe to a new
 // window to a same-origin non-app URL (path3/empty.html) should keep the window
 // in the app process.
 // This is in contrast to OpenAppFromIframe, since here the popup will not be
@@ skipping 12 matching lines @@
   const Extension* app =
       LoadExtension(test_data_dir_.AppendASCII("app_process"));
   ASSERT_TRUE(app);
 
   ui_test_utils::WindowedNotificationObserver popup_observer(
         content::NOTIFICATION_RENDER_VIEW_HOST_CREATED,
         content::NotificationService::AllSources());
   ui_test_utils::NavigateToURL(browser(),
                                base_url.Resolve("path1/container.html"));
   content::RenderProcessHost* process =
-      browser()->GetWebContentsAt(0)->GetRenderProcessHost();
+      chrome::GetWebContentsAt(browser(), 0)->GetRenderProcessHost();
   EXPECT_TRUE(process_map->Contains(process->GetID()));
 
   // Wait for popup window to appear.
   popup_observer.Wait();
 
   // Popup window should be in the app's process.
   RenderViewHost* popup_host =
       content::Source<RenderViewHost>(popup_observer.source()).ptr();
   EXPECT_EQ(process, popup_host->GetProcess());
 }
@@ skipping 10 matching lines @@
 
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app_process")));
 
   GURL base_url = GetTestBaseURL("app_process");
 
   // Load the app, chrome.app.isInstalled should be true.
   ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path1/empty.html"));
-  WebContents* contents = browser()->GetWebContentsAt(0);
+  WebContents* contents = chrome::GetWebContentsAt(browser(), 0);
   EXPECT_TRUE(process_map->Contains(
       contents->GetRenderProcessHost()->GetID()));
   bool is_installed = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       contents->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(chrome.app.isInstalled)",
       &is_installed));
   ASSERT_TRUE(is_installed);
 
   // Crash the tab and reload it, chrome.app.isInstalled should still be true.
-  ui_test_utils::CrashTab(browser()->GetActiveWebContents());
+  ui_test_utils::CrashTab(chrome::GetActiveWebContents(browser()));
   ui_test_utils::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
-          &browser()->GetActiveWebContents()->GetController()));
+          &chrome::GetActiveWebContents(browser())->GetController()));
   chrome::Reload(browser(), CURRENT_TAB);
   observer.Wait();
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       contents->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(chrome.app.isInstalled)",
       &is_installed));
   ASSERT_TRUE(is_installed);
 }