Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

content/browser/accessibility/renderer_accessibility_browsertest.cc

 // Copyright (c) 2011 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/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
-#include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/web_contents.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
 #include <atlcom.h>
 #include "ui/base/win/atl_module.h"
 #endif
 
 using content::OpenURLParams;
 using content::Referrer;
 using webkit_glue::WebAccessibility;
 
 namespace {
 
 class RendererAccessibilityBrowserTest : public InProcessBrowserTest {
  public:
   RendererAccessibilityBrowserTest() {}
 
   // Tell the renderer to send an accessibility tree, then wait for the
   // notification that it's been received.
   const WebAccessibility& GetWebAccessibilityTree() {
     ui_test_utils::WindowedNotificationObserver tree_updated_observer(
         content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
         content::NotificationService::AllSources());
     RenderWidgetHostView* host_view =
-        browser()->GetSelectedTabContents()->GetRenderWidgetHostView();
+        browser()->GetSelectedWebContents()->GetRenderWidgetHostView();
     RenderWidgetHost* host = host_view->GetRenderWidgetHost();
     RenderViewHost* view_host = static_cast<RenderViewHost*>(host);
     view_host->set_save_accessibility_tree_for_testing(true);
     view_host->EnableRendererAccessibility();
     tree_updated_observer.Wait();
     return view_host->accessibility_tree_for_testing();
   }
 
   // Make sure each node in the tree has an unique id.
   void RecursiveAssertUniqueIds(
@@ skipping 402 matching lines @@
   const WebAccessibility& tree = GetWebAccessibilityTree();
 
   ASSERT_EQ(1U, tree.children.size());
   const WebAccessibility& textbox = tree.children[0];
 
   EXPECT_EQ(
       true, GetBoolAttr(textbox, WebAccessibility::ATTR_CAN_SET_VALUE));
 }
 
 }  // namespace