Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/autofill/form_structure_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 <vector>
 
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/data_driven_test.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/ui/browser.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 "googleurl/src/gurl.h"
 
 namespace {
 
 const FilePath::CharType kTestName[] = FILE_PATH_LITERAL("heuristics");
 
 // Convert the |html| snippet to a data URI.
@@ skipping 28 matching lines @@
 
 FormStructureBrowserTest::~FormStructureBrowserTest() {
 }
 
 void FormStructureBrowserTest::GenerateResults(const std::string& input,
                                                std::string* output) {
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
                                                        HTMLToDataURI(input)));
 
   AutofillManager* autofill_manager =
-      browser()->GetActiveTabContents()->autofill_manager();
+      chrome::GetActiveTabContents(browser())->autofill_manager();
   ASSERT_NE(static_cast<AutofillManager*>(NULL), autofill_manager);
   std::vector<FormStructure*> forms = autofill_manager->form_structures_.get();
   *output = FormStructureBrowserTest::FormStructuresToString(forms);
 }
 
 std::string FormStructureBrowserTest::FormStructuresToString(
     const std::vector<FormStructure*>& forms) {
   std::string forms_string;
   for (std::vector<FormStructure*>::const_iterator iter = forms.begin();
        iter != forms.end();
@@ skipping 163 matching lines @@
                     kFileNamePattern);
 }
 
 IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
     MAYBE_DataDrivenHeuristics(20)) {
   const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("20_*.html");
   RunDataDrivenTest(GetInputDirectory(kTestName),
                     GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }