Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/accessibility/accessibility_win_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 <atlbase.h>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/accessibility_test_utils_win.h"
@@ skipping 180 matching lines @@
         return;
     }
   }
 }
 
 // Retrieve the MSAA client accessibility object for the Render Widget Host View
 // of the selected tab.
 IAccessible*
 AccessibilityWinBrowserTest::GetRendererAccessible() {
   content::RenderViewHostTester::EnableAccessibilityUpdatedNotifications(
-      browser()->GetActiveWebContents()->GetRenderViewHost());
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost());
 
   HWND hwnd_render_widget_host_view =
-      browser()->GetActiveWebContents()->GetRenderWidgetHostView()->
+      chrome::GetActiveWebContents(browser())->GetRenderWidgetHostView()->
           GetNativeView();
 
   // Invoke windows screen reader detection by sending the WM_GETOBJECT message
   // with kIdCustom as the LPARAM.
   const int32 kIdCustom = 1;
   SendMessage(
       hwnd_render_widget_host_view, WM_GETOBJECT, OBJID_CLIENT, kIdCustom);
 
   IAccessible* accessible;
   HRESULT hr = AccessibleObjectFromWindow(
       hwnd_render_widget_host_view, OBJID_CLIENT,
       IID_IAccessible, reinterpret_cast<void**>(&accessible));
   EXPECT_EQ(S_OK, hr);
   EXPECT_NE(accessible, reinterpret_cast<IAccessible*>(NULL));
 
   return accessible;
 }
 
 void AccessibilityWinBrowserTest::ExecuteScript(wstring script) {
-  browser()->GetActiveWebContents()->GetRenderViewHost()->
+  chrome::GetActiveWebContents(browser())->GetRenderViewHost()->
       ExecuteJavascriptInWebFrame(L"", script);
 }
 
 // This constructor can be used if IA2 role will be the same as MSAA role
 AccessibleChecker::AccessibleChecker(
     wstring expected_name, int32 expected_role, wstring expected_value) :
     name_(expected_name),
     role_(expected_role),
     ia2_role_(expected_role),
     value_(expected_value),
@@ skipping 655 matching lines @@
 
   // Check the browser's copy of the renderer accessibility tree.
   AccessibleChecker grouping1_checker(L"", ROLE_SYSTEM_GROUPING, L"");
   AccessibleChecker grouping2_checker(L"", ROLE_SYSTEM_GROUPING, L"");
   AccessibleChecker document_checker(L"", ROLE_SYSTEM_DOCUMENT, L"");
   document_checker.AppendExpectedChild(&grouping1_checker);
   document_checker.AppendExpectedChild(&grouping2_checker);
   document_checker.CheckAccessible(GetRendererAccessible());
 }
 }  // namespace.