Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

content/browser/download/save_package_browsertest.cc

 // Copyright (c) 2011 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/scoped_temp_dir.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/download/save_package.h"
 
 namespace {
 
 const char kTestFile[] = "files/save_page/a.htm";
 
 class SavePackageBrowserTest : public InProcessBrowserTest {
  protected:
@@ skipping 16 matching lines @@
 
 // Create a SavePackage and delete it without calling Init.
 // SavePackage dtor has various asserts/checks that should not fire.
 IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ImplicitCancel) {
   ASSERT_TRUE(test_server()->Start());
   GURL url = test_server()->GetURL(kTestFile);
   ui_test_utils::NavigateToURL(browser(), url);
   FilePath full_file_name, dir;
   GetDestinationPaths("a", &full_file_name, &dir);
   scoped_refptr<SavePackage> save_package(new SavePackage(
-      browser()->GetActiveWebContents(),
+      chrome::GetActiveWebContents(browser()),
       content::SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name, dir));
   ASSERT_TRUE(test_server()->Stop());
 }
 
 // Create a SavePackage, call Cancel, then delete it.
 // SavePackage dtor has various asserts/checks that should not fire.
 IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ExplicitCancel) {
   ASSERT_TRUE(test_server()->Start());
   GURL url = test_server()->GetURL(kTestFile);
   ui_test_utils::NavigateToURL(browser(), url);
   FilePath full_file_name, dir;
   GetDestinationPaths("a", &full_file_name, &dir);
   scoped_refptr<SavePackage> save_package(new SavePackage(
-      browser()->GetActiveWebContents(),
+      chrome::GetActiveWebContents(browser()),
       content::SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name, dir));
   save_package->Cancel(true);
   ASSERT_TRUE(test_server()->Stop());
 }
 
 }  // namespace