TabContentsWrapper -> TabContents, part 12.

chrome/browser/extensions/app_notify_channel_ui.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/extensions/app_notify_channel_ui.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.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/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "grit/generated_resources.h"
@@ skipping 56 matching lines @@
   return true;
 }
 
 void AppNotifyChannelUIImpl::InfoBar::InfoBarDismissed() {
   Cancel();
 }
 
 
 AppNotifyChannelUIImpl::AppNotifyChannelUIImpl(
     Profile* profile,
-    TabContentsWrapper* wrapper,
+    TabContents* tab_contents,
     const std::string& app_name,
     AppNotifyChannelUI::UIType ui_type)
     : profile_(profile->GetOriginalProfile()),
-      wrapper_(wrapper),
+      tab_contents_(tab_contents),
       app_name_(app_name),
       ui_type_(ui_type),
       delegate_(NULL),
       observing_sync_(false),
       wizard_shown_to_user_(false) {
 }
 
 AppNotifyChannelUIImpl::~AppNotifyChannelUIImpl() {
   // We should have either not started observing sync, or already called
   // StopObservingSync by this point.
   CHECK(!observing_sync_);
 }
 
 void AppNotifyChannelUIImpl::PromptSyncSetup(
     AppNotifyChannelUI::Delegate* delegate) {
   CHECK(delegate_ == NULL);
   delegate_ = delegate;
 
   if (!ProfileSyncServiceFactory::GetInstance()->HasProfileSyncService(
           profile_)) {
     delegate_->OnSyncSetupResult(false);
     return;
   }
 
   if (ui_type_ == NO_INFOBAR) {
     OnInfoBarResult(true);
     return;
   }
 
-  InfoBarTabHelper* helper = wrapper_->infobar_tab_helper();
+  InfoBarTabHelper* helper = tab_contents_->infobar_tab_helper();
   helper->AddInfoBar(new AppNotifyChannelUIImpl::InfoBar(
       this, helper, app_name_));
 }
 
 void AppNotifyChannelUIImpl::OnInfoBarResult(bool accepted) {
   if (accepted) {
     StartObservingSync();
     // Bring up the login page.
     LoginUIService* login_ui_service =
         LoginUIServiceFactory::GetForProfile(profile_);
@@ skipping 55 matching lines @@
   ProfileSyncServiceFactory::GetInstance()->GetForProfile(
       profile_)->AddObserver(this);
 }
 
 void AppNotifyChannelUIImpl::StopObservingSync() {
   CHECK(observing_sync_);
   observing_sync_ = false;
   ProfileSyncServiceFactory::GetInstance()->GetForProfile(
       profile_)->RemoveObserver(this);
 }