TabContentsWrapper -> TabContents, part 30.

chrome/browser/tab_contents/tab_contents_ssl_helper.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/tab_contents/tab_contents_ssl_helper.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/ssl_add_cert_handler.h"
 #include "chrome/browser/ssl_client_certificate_selector.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/simple_alert_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/chrome_switches.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/net_errors.h"
 #include "net/base/x509_certificate.h"
@@ skipping 70 matching lines @@
 }
 
 }  // namespace
 
 
 // TabContentsSSLHelper::SSLAddCertData ---------------------------------------
 
 class TabContentsSSLHelper::SSLAddCertData
     : public content::NotificationObserver {
  public:
-  explicit SSLAddCertData(TabContentsWrapper* tab_contents);
+  explicit SSLAddCertData(TabContents* tab_contents);
   virtual ~SSLAddCertData();
 
   // Displays |delegate| as an infobar in |tab_|, replacing our current one if
   // still active.
   void ShowInfoBar(InfoBarDelegate* delegate);
 
   // Same as above, for the common case of wanting to show a simple alert
   // message.
   void ShowErrorInfoBar(const string16& message);
 
  private:
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
-  TabContentsWrapper* tab_contents_;
+  TabContents* tab_contents_;
   InfoBarDelegate* infobar_delegate_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLAddCertData);
 };
 
 TabContentsSSLHelper::SSLAddCertData::SSLAddCertData(
-    TabContentsWrapper* tab_contents)
+    TabContents* tab_contents)
     : tab_contents_(tab_contents),
       infobar_delegate_(NULL) {
   content::Source<InfoBarTabHelper> source(tab_contents_->infobar_tab_helper());
   registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
                  source);
   registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REPLACED,
                  source);
 }
 
 TabContentsSSLHelper::SSLAddCertData::~SSLAddCertData() {
@@ skipping 24 matching lines @@
   if (infobar_delegate_ ==
       ((type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED) ?
           content::Details<InfoBarRemovedDetails>(details)->first :
           content::Details<InfoBarReplacedDetails>(details)->first))
     infobar_delegate_ = NULL;
 }
 
 
 // TabContentsSSLHelper -------------------------------------------------------
 
-TabContentsSSLHelper::TabContentsSSLHelper(TabContentsWrapper* tab_contents)
+TabContentsSSLHelper::TabContentsSSLHelper(TabContents* tab_contents)
     : tab_contents_(tab_contents) {
 }
 
 TabContentsSSLHelper::~TabContentsSSLHelper() {
 }
 
 void TabContentsSSLHelper::ShowClientCertificateRequestDialog(
     const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
     const base::Callback<void(net::X509Certificate*)>& callback) {
@@ skipping 45 matching lines @@
 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData(
     SSLAddCertHandler* handler) {
   // Find/create the slot.
   linked_ptr<SSLAddCertData>& ptr_ref =
       request_id_to_add_cert_data_[handler->network_request_id()];
   // Fill it if necessary.
   if (!ptr_ref.get())
     ptr_ref.reset(new SSLAddCertData(tab_contents_));
   return ptr_ref.get();
 }