Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/sync/test/integration/sync_test.cc

Index: chrome/browser/sync/test/integration/sync_test.cc
===================================================================
--- chrome/browser/sync/test/integration/sync_test.cc	(revision 145001)
+++ chrome/browser/sync/test/integration/sync_test.cc	(working copy)
@@ -30,6 +30,7 @@
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
@@ -617,7 +618,7 @@
   std::string path = "chromiumsync/disablenotifications";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Notifications disabled",
-            UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle()));
+            UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle()));
 }
 
 void SyncTest::DisableNotifications() {
@@ -630,7 +631,7 @@
   std::string path = "chromiumsync/enablenotifications";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Notifications enabled",
-            UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle()));
+            UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle()));
 }
 
 void SyncTest::EnableNotifications() {
@@ -650,7 +651,7 @@
       syncer::kSyncP2PNotificationChannel + "&data=" + data;
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Notification sent",
-            UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle()));
+            UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle()));
 }
 
 bool SyncTest::ServerSupportsErrorTriggering() const {
@@ -675,7 +676,7 @@
   }
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Migration: 200",
-            UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle()));
+            UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle()));
 }
 
 void SyncTest::TriggerBirthdayError() {
@@ -683,7 +684,7 @@
   std::string path = "chromiumsync/birthdayerror";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Birthday error",
-            UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle()));
+            UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle()));
 }
 
 void SyncTest::TriggerTransientError() {
@@ -691,7 +692,7 @@
   std::string path = "chromiumsync/transienterror";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Transient error",
-            UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle()));
+            UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle()));
 }
 
 void SyncTest::TriggerAuthError() {
@@ -769,7 +770,7 @@
 
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   std::string output = UTF16ToASCII(
-      browser()->GetActiveWebContents()->GetTitle());
+      chrome::GetActiveWebContents(browser())->GetTitle());
   ASSERT_TRUE(output.find("SetError: 200") != string16::npos);
 }
 
@@ -778,7 +779,7 @@
   std::string path = "chromiumsync/createsyncedbookmarks";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Synced Bookmarks",
-            UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle()));
+            UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle()));
 }
 
 int SyncTest::NumberOfDefaultSyncItems() const {