TabContentsWrapper -> TabContents, part 56.

That's almost all.

BUG=131026
TEST=no change

Review URL: https://chromiumcodereview.appspot.com/10551002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141891 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/accessibility/accessibility_extension_api.cc b/chrome/browser/accessibility/accessibility_extension_api.cc
index dcac721..981bf0b 100644
--- a/chrome/browser/accessibility/accessibility_extension_api.cc
+++ b/chrome/browser/accessibility/accessibility_extension_api.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "content/public/browser/notification_service.h"
@@ -197,7 +197,7 @@ bool GetAlertsForTabFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &tab_id));
 
   TabStripModel* tab_strip = NULL;
-  TabContentsWrapper* contents = NULL;
+  TabContents* contents = NULL;
   int tab_index = -1;
   if (!ExtensionTabUtil::GetTabById(tab_id, profile(), include_incognito(),
                                     NULL, &tab_strip, &contents, &tab_index)) {
diff --git a/chrome/browser/accessibility/accessibility_extension_apitest.cc b/chrome/browser/accessibility/accessibility_extension_apitest.cc
index eb200ec..158e58a 100644
--- a/chrome/browser/accessibility/accessibility_extension_apitest.cc
+++ b/chrome/browser/accessibility/accessibility_extension_apitest.cc
@@ -7,11 +7,11 @@
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetAlertsForTab) {
-  TabContentsWrapper* tab = browser()->GetSelectedTabContentsWrapper();
+  TabContents* tab = browser()->GetActiveTabContents();
   ASSERT_TRUE(tab);
   InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper();
 
diff --git a/chrome/browser/accessibility/accessibility_win_browsertest.cc b/chrome/browser/accessibility/accessibility_win_browsertest.cc
index fdf3ff6..c7a9720 100644
--- a/chrome/browser/accessibility/accessibility_win_browsertest.cc
+++ b/chrome/browser/accessibility/accessibility_win_browsertest.cc
@@ -210,10 +210,10 @@ void RecursiveFindNodeInAccessibilityTree(
 IAccessible*
 AccessibilityWinBrowserTest::GetRendererAccessible() {
   content::RenderViewHostTester::EnableAccessibilityUpdatedNotifications(
-      browser()->GetSelectedWebContents()->GetRenderViewHost());
+      browser()->GetActiveWebContents()->GetRenderViewHost());
 
   HWND hwnd_render_widget_host_view =
-      browser()->GetSelectedWebContents()->GetRenderWidgetHostView()->
+      browser()->GetActiveWebContents()->GetRenderWidgetHostView()->
           GetNativeView();
 
   // Invoke windows screen reader detection by sending the WM_GETOBJECT message
@@ -233,7 +233,7 @@ AccessibilityWinBrowserTest::GetRendererAccessible() {
 }
 
 void AccessibilityWinBrowserTest::ExecuteScript(wstring script) {
-  browser()->GetSelectedWebContents()->GetRenderViewHost()->
+  browser()->GetActiveWebContents()->GetRenderViewHost()->
       ExecuteJavascriptInWebFrame(L"", script);
 }