Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/download/download_danger_prompt_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 "base/bind.h"
 #include "base/file_path.h"
 #include "chrome/browser/download/download_danger_prompt.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/mock_download_item.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::ByRef;
 using ::testing::Eq;
@@ skipping 56 matching lines @@
     EXPECT_CALL(download_, GetFileNameToReportUser()).WillRepeatedly(Return(
         FilePath(FILE_PATH_LITERAL("evil.exe"))));
     EXPECT_CALL(download_, AddObserver(_))
       .WillOnce(SaveArg<0>(&download_observer_));
     EXPECT_CALL(download_, RemoveObserver(Eq(ByRef(download_observer_))));
   }
 
   void CreatePrompt() {
     prompt_ = DownloadDangerPrompt::Create(
         &download_,
-        browser()->GetActiveTabContents(),
+        chrome::GetActiveTabContents(browser()),
         base::Bind(&DownloadDangerPromptTest::PromptCallback, this,
                    DownloadDangerPrompt::ACCEPT),
         base::Bind(&DownloadDangerPromptTest::PromptCallback, this,
                    DownloadDangerPrompt::CANCEL));
     ui_test_utils::RunAllPendingInMessageLoop();
   }
 
   void PromptCallback(DownloadDangerPrompt::Action action) {
     EXPECT_FALSE(did_receive_callback_);
     EXPECT_EQ(expected_action_, action);
@@ skipping 36 matching lines @@
   EXPECT_CALL(download(), IsDangerous()).WillOnce(Return(false));
   download_observer()->OnDownloadUpdated(&download());
   VerifyExpectations();
 
   // If the containing tab is closed, the dialog should be canceled.
   OpenNewTab();
   SetUpExpectations(DownloadDangerPrompt::CANCEL);
   chrome::CloseTab(browser());
   VerifyExpectations();
 }