Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

content/browser/accessibility/renderer_accessibility_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/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/renderer_host/render_view_host_impl.h"
 #include "content/common/accessibility_node_data.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 
 #if defined(OS_WIN)
@@ skipping 15 matching lines @@
   RendererAccessibilityBrowserTest() {}
 
   // Tell the renderer to send an accessibility tree, then wait for the
   // notification that it's been received.
   const AccessibilityNodeData& GetAccessibilityNodeDataTree(
       AccessibilityMode accessibility_mode = AccessibilityModeComplete) {
     ui_test_utils::WindowedNotificationObserver tree_updated_observer(
         content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
         content::NotificationService::AllSources());
     content::RenderWidgetHostView* host_view =
-        browser()->GetActiveWebContents()->GetRenderWidgetHostView();
+        chrome::GetActiveWebContents(browser())->GetRenderWidgetHostView();
     RenderWidgetHostImpl* host =
         RenderWidgetHostImpl::From(host_view->GetRenderWidgetHost());
     RenderViewHostImpl* view_host = static_cast<RenderViewHostImpl*>(host);
     view_host->set_save_accessibility_tree_for_testing(true);
     view_host->SetAccessibilityMode(accessibility_mode);
     tree_updated_observer.Wait();
     return view_host->accessibility_tree_for_testing();
   }
 
   // Make sure each node in the tree has an unique id.
@@ skipping 466 matching lines @@
 
   const AccessibilityNodeData& text6 = tree.children[6];
   EXPECT_EQ(AccessibilityNodeData::ROLE_TEXT_FIELD, text6.role);
   EXPECT_STREQ("text6", UTF16ToUTF8(text6.value).c_str());
 
   const AccessibilityNodeData& text7 = tree.children[7];
   EXPECT_EQ(AccessibilityNodeData::ROLE_GROUP, text7.role);
 }
 
 }  // namespace