Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

Index: chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
===================================================================
--- chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc	(revision 145001)
+++ chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc	(working copy)
@@ -15,6 +15,7 @@
 #include "chrome/browser/intents/default_web_intent_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
@@ -235,8 +236,8 @@
         GetBrowser()->profile(), Profile::EXPLICIT_ACCESS);
     favicon_service_ =
         GetBrowser()->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
-    controller_ = GetBrowser()->
-        GetActiveTabContents()->web_intent_picker_controller();
+    controller_ = chrome::GetActiveTabContents(GetBrowser())->
+        web_intent_picker_controller();
 
     SetupMockPicker();
     controller_->set_model_observer(&picker_);
@@ -351,7 +352,7 @@
   OnServiceChosen(kServiceURL2, WebIntentPickerModel::DISPOSITION_WINDOW);
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL2),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 
   EXPECT_TRUE(dispatcher.dispatched_);
 
@@ -390,14 +391,14 @@
   AddWebIntentService(kAction1, kServiceURL1);
   AddCWSExtensionServiceEmpty(kAction1);
 
-  GURL original = browser()->GetActiveWebContents()->GetURL();
+  GURL original = chrome::GetActiveWebContents(browser())->GetURL();
 
   // Open a new page, but keep focus on original.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUINewTabURL), NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   ASSERT_EQ(2, browser()->tab_count());
-  EXPECT_EQ(original, browser()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(original, chrome::GetActiveWebContents(browser())->GetURL());
 
   controller_->ShowDialog(kAction1, kType1);
   picker_.Wait();
@@ -412,13 +413,13 @@
   OnServiceChosen(kServiceURL1, WebIntentPickerModel::DISPOSITION_WINDOW);
   ASSERT_EQ(3, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL1),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 
   EXPECT_TRUE(dispatcher.dispatched_);
 
   OnSendReturnMessage(webkit_glue::WEB_INTENT_REPLY_SUCCESS);
   ASSERT_EQ(2, browser()->tab_count());
-  EXPECT_EQ(original, browser()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(original, chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 class WebIntentPickerControllerIncognitoBrowserTest :
@@ -596,7 +597,7 @@
   // The tab is shown immediately without needing to call OnServiceChosen.
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL1),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 
   EXPECT_TRUE(dispatcher.dispatched_);
 }