Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/tab_modal_confirm_dialog_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/ui/tab_modal_confirm_dialog_browsertest.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
-#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class MockTabModalConfirmDialogDelegate : public TabModalConfirmDialogDelegate {
  public:
   explicit MockTabModalConfirmDialogDelegate(content::WebContents* web_contents)
       : TabModalConfirmDialogDelegate(web_contents) {}
 
@@ skipping 10 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(MockTabModalConfirmDialogDelegate);
 };
 
 TabModalConfirmDialogTest::TabModalConfirmDialogTest()
     : delegate_(NULL),
       dialog_(NULL) {}
 
 void TabModalConfirmDialogTest::SetUpOnMainThread() {
   delegate_ = new MockTabModalConfirmDialogDelegate(
-      browser()->GetActiveWebContents());
+      chrome::GetActiveWebContents(browser()));
   dialog_ = CreateTestDialog(delegate_,
-                             browser()->GetActiveTabContents());
+                             chrome::GetActiveTabContents(browser()));
   ui_test_utils::RunAllPendingInMessageLoop();
 }
 
 void TabModalConfirmDialogTest::CleanUpOnMainThread() {
   ui_test_utils::RunAllPendingInMessageLoop();
   ::testing::Mock::VerifyAndClearExpectations(delegate_);
 }
 
 // On Mac OS, these methods need to be compiled as Objective-C++, so they're in
 // a separate file.
@@ skipping 32 matching lines @@
   EXPECT_CALL(*delegate_, OnCanceled());
   delegate_->Cancel();
 }
 
 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Quit) {
   EXPECT_CALL(*delegate_, OnCanceled());
   MessageLoopForUI::current()->PostTask(FROM_HERE,
                                         base::Bind(&browser::AttemptExit));
   ui_test_utils::RunMessageLoop();
 }