TabContentsWrapper -> TabContents, part 12.

chrome/browser/extensions/extension_debugger_api.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.
 
 // Implements the Chrome Extensions Debugger API.
 
 #include "chrome/browser/extensions/extension_debugger_api.h"
 
 #include <map>
 #include <set>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_debugger_api_constants.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/infobars/infobar.h"
 #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/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/browser/devtools_client_host.h"
 #include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 138 matching lines @@
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(profile));
 
   // Attach to debugger and tell it we are ready.
   DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
       web_contents_->GetRenderViewHost());
   DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(agent, this);
 
   InfoBarTabHelper* infobar_helper =
-      TabContentsWrapper::GetCurrentWrapperForContents(web_contents_)->
-          infobar_tab_helper();
+      TabContents::FromWebContents(web_contents_)->infobar_tab_helper();
   infobar_delegate_ =
       new ExtensionDevToolsInfoBarDelegate(infobar_helper, extension_name);
   if (infobar_helper->AddInfoBar(infobar_delegate_)) {
     registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
                    content::Source<InfoBarTabHelper>(infobar_helper));
   } else {
     infobar_delegate_ = NULL;
   }
 }
 
 ExtensionDevToolsClientHost::~ExtensionDevToolsClientHost() {
   // Ensure calling RemoveInfoBar() below won't result in Observe() trying to
   // Close() us.
   registrar_.RemoveAll();
 
   if (infobar_delegate_) {
-    TabContentsWrapper* wrapper =
-        TabContentsWrapper::GetCurrentWrapperForContents(web_contents_);
-    InfoBarTabHelper* helper = wrapper->infobar_tab_helper();
+    TabContents* tab_contents = TabContents::FromWebContents(web_contents_);
+    InfoBarTabHelper* helper = tab_contents->infobar_tab_helper();
     if (helper)
       helper->RemoveInfoBar(infobar_delegate_);
   }
   AttachedClientHosts::GetInstance()->Remove(this);
 }
 
 bool ExtensionDevToolsClientHost::MatchesContentsAndExtensionId(
     WebContents* web_contents,
     const std::string& extension_id) {
   return web_contents == web_contents_ && extension_id_ == extension_id;
@@ skipping 141 matching lines @@
       client_host_(0) {
 }
 
 bool DebuggerFunction::InitTabContents() {
   Value* debuggee;
   EXTENSION_FUNCTION_VALIDATE(args_->Get(0, &debuggee));
 
   DictionaryValue* dict = static_cast<DictionaryValue*>(debuggee);
   EXTENSION_FUNCTION_VALIDATE(dict->GetInteger(keys::kTabIdKey, &tab_id_));
 
-  // Find the TabContentsWrapper that contains this tab id.
+  // Find the TabContents that contains this tab id.
   contents_ = NULL;
-  TabContentsWrapper* wrapper = NULL;
+  TabContents* tab_contents = NULL;
   bool result = ExtensionTabUtil::GetTabById(
-      tab_id_, profile(), include_incognito(), NULL, NULL, &wrapper, NULL);
-  if (!result || !wrapper) {
+      tab_id_, profile(), include_incognito(), NULL, NULL, &tab_contents, NULL);
+  if (!result || !tab_contents) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
         keys::kNoTabError,
         base::IntToString(tab_id_));
     return false;
   }
-  contents_ = wrapper->web_contents();
+  contents_ = tab_contents->web_contents();
 
   if (content::GetContentClient()->HasWebUIScheme(
           contents_->GetURL())) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
         keys::kAttachToWebUIError,
         contents_->GetURL().scheme());
     return false;
   }
 
   return true;
@@ skipping 97 matching lines @@
     return;
   }
 
   Value* result_body;
   if (dictionary->Get("result", &result_body))
     result_.reset(result_body->DeepCopy());
   else
     result_.reset(new DictionaryValue());
   SendResponse(true);
 }