Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/sync/test/integration/sync_test.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/sync/test/integration/sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #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"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
@@ skipping 567 matching lines @@
 
   // Supported only if we're using the python testserver.
   return server_type_ == LOCAL_PYTHON_SERVER;
 }
 
 void SyncTest::DisableNotificationsImpl() {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   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() {
   DisableNotificationsImpl();
   notifications_enabled_ = false;
 }
 
 void SyncTest::EnableNotificationsImpl() {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   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() {
   EnableNotificationsImpl();
   notifications_enabled_ = true;
 }
 
 void SyncTest::TriggerNotification(
     syncable::ModelTypeSet changed_types) {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   const std::string& data =
       syncer::P2PNotificationData("from_server",
                                          syncer::NOTIFY_ALL,
                                          changed_types).ToString();
   const std::string& path =
       std::string("chromiumsync/sendnotification?channel=") +
       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 {
   EXPECT_NE(SERVER_TYPE_UNDECIDED, server_type_);
 
   // Supported only if we're using the python testserver.
   return server_type_ == LOCAL_PYTHON_SERVER;
 }
 
 void SyncTest::TriggerMigrationDoneError(
     syncable::ModelTypeSet model_types) {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   std::string path = "chromiumsync/migrate";
   char joiner = '?';
   for (syncable::ModelTypeSet::Iterator it = model_types.First();
        it.Good(); it.Inc()) {
     path.append(
         base::StringPrintf(
             "%ctype=%d", joiner,
             syncable::GetSpecificsFieldNumberFromModelType(it.Get())));
     joiner = '&';
   }
   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() {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   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() {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   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() {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   std::string path = "chromiumsync/cred";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
 }
 
 namespace {
 
@@ skipping 57 matching lines @@
   path.append(base::StringPrintf("?error=%d", error_type));
   path.append(base::StringPrintf("&action=%d", action));
 
   path.append(base::StringPrintf("&error_description=%s",
                                  error.error_description.c_str()));
   path.append(base::StringPrintf("&url=%s", error.url.c_str()));
   path.append(base::StringPrintf("&frequency=%d", frequency));
 
   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);
 }
 
 void SyncTest::TriggerCreateSyncedBookmarks() {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   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 {
   return number_of_default_sync_items_;
 }
 
 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
                               const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SetProxyConfigCallback, &done,
                  make_scoped_refptr(context_getter), proxy_config));
   done.Wait();
 }