Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

content/browser/download/mhtml_generation_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 "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/testing_browser_process.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::WebContents;
 
 namespace {
@@ skipping 30 matching lines @@
 // renderer.
 IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateMHTML) {
   ASSERT_TRUE(test_server()->Start());
 
   FilePath path(temp_dir_.path());
   path = path.Append(FILE_PATH_LITERAL("test.mht"));
 
   ui_test_utils::NavigateToURL(browser(),
       test_server()->GetURL("files/google/google.html"));
 
-  WebContents* web_contents = browser()->GetActiveWebContents();
+  WebContents* web_contents = chrome::GetActiveWebContents(browser());
   web_contents->GenerateMHTML(path,
                               base::Bind(&MHTMLGenerationTest::MHTMLGenerated,
                                          this));
 
   // Block until the MHTML is generated.
   ui_test_utils::RunMessageLoop();
 
   EXPECT_TRUE(mhtml_generated());
   EXPECT_GT(file_size(), 0);
 
   // Make sure the actual generated file has some contents.
   int64 file_size;
   ASSERT_TRUE(file_util::GetFileSize(path, &file_size));
   EXPECT_GT(file_size, 100);
 }
 
 }  // namespace