Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

content/browser/accessibility/dump_accessibility_tree_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 <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.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/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/dump_accessibility_tree_helper.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/port/browser/render_widget_host_view_port.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 53 matching lines @@
     // Actual file has been fully checked.
     return diff_lines;
   }
 
   DumpAccessibilityTreeHelper helper_;
 };
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        PlatformTreeDifferenceTest) {
   RenderWidgetHostViewPort* host_view = static_cast<RenderWidgetHostViewPort*>(
-          browser()->GetActiveWebContents()->GetRenderWidgetHostView());
+      chrome::GetActiveWebContents(browser())->GetRenderWidgetHostView());
   RenderWidgetHost* host = host_view->GetRenderWidgetHost();
   RenderViewHostImpl* view_host =
       static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(host));
   view_host->set_save_accessibility_tree_for_testing(true);
   view_host->SetAccessibilityMode(AccessibilityModeComplete);
 
   // Setup test paths.
   FilePath dir_test_data;
   EXPECT_TRUE(PathService::Get(content::DIR_TEST_DATA, &dir_test_data));
   FilePath test_path(dir_test_data.Append(FILE_PATH_LITERAL("accessibility")));
@@ skipping 96 matching lines @@
 
       EXPECT_TRUE(file_util::WriteFile(
           actual_file, actual_contents.c_str(), actual_contents.size()));
 
       ADD_FAILURE() << "No expectation found. Create it by doing:\n"
           << "mv " << actual_file.LossyDisplayName() << " "
           << expected_file.LossyDisplayName();
     }
   } while (!(html_file = file_enumerator.Next()).empty());
 }