TabContentsWrapper -> TabContents, part 6.

chrome/browser/automation/automation_util.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 "chrome/browser/automation/automation_util.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/automation_id.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 361 matching lines @@
 bool SendErrorIfModalDialogActive(AutomationProvider* provider,
                                   IPC::Message* message) {
   bool active = AppModalDialogQueue::GetInstance()->HasActiveDialog();
   if (active) {
     AutomationJSONReply(provider, message).SendErrorCode(
         automation::kBlockedByModalDialog);
   }
   return active;
 }
 
-AutomationId GetIdForTab(const TabContentsWrapper* tab) {
+AutomationId GetIdForTab(const TabContents* tab) {
   return AutomationId(
       AutomationId::kTypeTab,
       base::IntToString(tab->restore_tab_helper()->session_id().id()));
 }
 
 AutomationId GetIdForExtensionView(
     const content::RenderViewHost* render_view_host) {
   AutomationId::Type type;
   WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host);
   switch (chrome::GetViewType(web_contents)) {
@@ skipping 25 matching lines @@
 bool GetTabForId(const AutomationId& id, WebContents** tab) {
   if (id.type() != AutomationId::kTypeTab)
     return false;
 
   printing::PrintPreviewTabController* preview_controller =
       printing::PrintPreviewTabController::GetInstance();
   BrowserList::const_iterator iter = BrowserList::begin();
   for (; iter != BrowserList::end(); ++iter) {
     Browser* browser = *iter;
     for (int tab_index = 0; tab_index < browser->tab_count(); ++tab_index) {
-      TabContentsWrapper* wrapper = browser->GetTabContentsWrapperAt(tab_index);
-      if (base::IntToString(wrapper->restore_tab_helper()->session_id().id()) ==
-              id.id()) {
-        *tab = wrapper->web_contents();
+      TabContents* tab_contents = browser->GetTabContentsAt(tab_index);
+      if (base::IntToString(
+              tab_contents->restore_tab_helper()->session_id().id()) ==
+                  id.id()) {
+        *tab = tab_contents->web_contents();
         return true;
       }
       if (preview_controller) {
-        TabContentsWrapper* preview_wrapper =
-            preview_controller->GetPrintPreviewForTab(wrapper);
-        if (preview_wrapper) {
+        TabContents* preview_tab_contents =
+            preview_controller->GetPrintPreviewForTab(tab_contents);
+        if (preview_tab_contents) {
           std::string preview_id = base::IntToString(
-              preview_wrapper->restore_tab_helper()->session_id().id());
+              preview_tab_contents->restore_tab_helper()->session_id().id());
           if (preview_id == id.id()) {
-            *tab = preview_wrapper->web_contents();
+            *tab = preview_tab_contents->web_contents();
             return true;
           }
         }
       }
     }
   }
   return false;
 }
 
 namespace {
@@ skipping 74 matching lines @@
       const extensions::Extension* extension;
       return GetExtensionForId(id, profile, &extension);
     }
     default:
       break;
   }
   return false;
 }
 
 }  // namespace automation_util