Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/content_setting_bubble_model.cc

 // Copyright (c) 2011 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/content_setting_bubble_model.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/blocked_content_container.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/favicon_tab_helper.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_specific_content_settings.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 class ContentSettingTitleAndLinkModel : public ContentSettingBubbleModel {
@@ skipping 350 matching lines @@
  private:
   void SetPopups() {
     // check for crbug.com/53176
     if (!tab_contents()->blocked_content_container())
       return;
     std::vector<TabContents*> blocked_contents;
     tab_contents()->blocked_content_container()->GetBlockedContents(
         &blocked_contents);
     for (std::vector<TabContents*>::const_iterator
          i(blocked_contents.begin()); i != blocked_contents.end(); ++i) {
-      // TODO(avi): move blocked contents from TC to TCW; remove this.
-      TabContentsWrapper* wrapper =
-          TabContentsWrapper::GetCurrentWrapperForContents(*i);
       std::string title(UTF16ToUTF8((*i)->GetTitle()));
       // The popup may not have committed a load yet, in which case it won't
       // have a URL or title.
       if (title.empty())
         title = l10n_util::GetStringUTF8(IDS_TAB_LOADING_TITLE);
       PopupItem popup_item;
       popup_item.title = title;
-      popup_item.bitmap = wrapper->favicon_tab_helper()->GetFavicon();
+      popup_item.bitmap = (*i)->GetFavicon();
       popup_item.tab_contents = (*i);
       add_popup(popup_item);
     }
   }
 
   virtual void OnPopupClicked(int index) {
     if (tab_contents() && tab_contents()->blocked_content_container()) {
       tab_contents()->blocked_content_container()->LaunchForContents(
           bubble_content().popup_items[index].tab_contents);
     }
@@ skipping 129 matching lines @@
   bubble_content_.resource_identifiers.insert(resource_identifier);
 }
 
 void ContentSettingBubbleModel::Observe(NotificationType type,
                                         const NotificationSource& source,
                                         const NotificationDetails& details) {
   DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED);
   DCHECK(source == Source<TabContents>(tab_contents_));
   tab_contents_ = NULL;
 }