Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/autofill/autofill_popup_view_browsertest.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/autofill/autofill_popup_view.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/autofill/test_autofill_external_delegate.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 34 matching lines @@
 };
 
 }  // namespace
 
 class AutofillPopupViewBrowserTest : public InProcessBrowserTest {
  public:
   AutofillPopupViewBrowserTest() {}
   virtual ~AutofillPopupViewBrowserTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    web_contents_ = browser()->GetActiveWebContents();
+    web_contents_ = chrome::GetActiveWebContents(browser());
     ASSERT_TRUE(web_contents_ != NULL);
 
     autofill_popup_view_.reset(new TestAutofillPopupView(
         web_contents_,
         &autofill_external_delegate_));
   }
 
  protected:
   content::WebContents* web_contents_;
   scoped_ptr<TestAutofillPopupView> autofill_popup_view_;
   MockAutofillExternalDelegate autofill_external_delegate_;
 };
 
 IN_PROC_BROWSER_TEST_F(AutofillPopupViewBrowserTest,
                        SwitchTabAndHideAutofillPopup) {
   EXPECT_CALL(*autofill_popup_view_, Hide()).Times(AtLeast(1));
 
   ui_test_utils::WindowedNotificationObserver observer(
       content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,
       content::Source<content::WebContents>(web_contents_));
-  browser()->AddSelectedTabWithURL(GURL(chrome::kAboutBlankURL),
-                                   content::PAGE_TRANSITION_START_PAGE);
+  chrome::AddSelectedTabWithURL(browser(), GURL(chrome::kAboutBlankURL),
+                                content::PAGE_TRANSITION_START_PAGE);
   observer.Wait();
 
   // The mock verifies that the call was made.
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillPopupViewBrowserTest,
                        TestPageNavigationHidingAutofillPopup) {
   EXPECT_CALL(*autofill_popup_view_, Hide()).Times(AtLeast(1));
 
   ui_test_utils::WindowedNotificationObserver observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<content::NavigationController>(
           &(web_contents_->GetController())));
   browser()->OpenURL(content::OpenURLParams(
       GURL(chrome::kAboutBlankURL), content::Referrer(),
       CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
   browser()->OpenURL(content::OpenURLParams(
       GURL(chrome::kChromeUIAboutURL), content::Referrer(),
       CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
   observer.Wait();
 
   // The mock verifies that the call was made.
 }