Removal of Profile from content part 1.

chrome/browser/favicon/favicon_tab_helper.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/favicon/favicon_tab_helper.h"
 
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/icon_messages.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/webui/web_ui.h"
 #include "content/common/notification_service.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
 
 FaviconTabHelper::FaviconTabHelper(TabContents* tab_contents)
     : TabContentsObserver(tab_contents) {
-  favicon_handler_.reset(new FaviconHandler(tab_contents->profile(), this,
+  Profile* profile = static_cast<Profile*>(tab_contents->context());
+  favicon_handler_.reset(new FaviconHandler(profile, this,
                                             FaviconHandler::FAVICON));
   if (chrome::kEnableTouchIcon)
-    touch_icon_handler_.reset(new FaviconHandler(tab_contents->profile(), this,
+    touch_icon_handler_.reset(new FaviconHandler(profile, this,
                                                  FaviconHandler::TOUCH));
 }
 
 FaviconTabHelper::~FaviconTabHelper() {
 }
 
 void FaviconTabHelper::FetchFavicon(const GURL& url) {
   favicon_handler_->FetchFavicon(url);
   if (touch_icon_handler_.get())
     touch_icon_handler_->FetchFavicon(url);
@@ skipping 38 matching lines @@
   return true;
 }
 
 void FaviconTabHelper::SaveFavicon() {
   NavigationEntry* entry = tab_contents()->controller().GetActiveEntry();
   if (!entry || entry->url().is_empty())
     return;
 
   // Make sure the page is in history, otherwise adding the favicon does
   // nothing.
-  HistoryService* history = tab_contents()->profile()->
+  Profile* profile = static_cast<Profile*>(tab_contents()->context());
+  HistoryService* history = profile->
       GetOriginalProfile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
   if (!history)
     return;
   history->AddPageNoVisitForBookmark(entry->url());
 
-  FaviconService* service = tab_contents()->profile()->
+  FaviconService* service = profile->
       GetOriginalProfile()->GetFaviconService(Profile::IMPLICIT_ACCESS);
   if (!service)
     return;
   const NavigationEntry::FaviconStatus& favicon(entry->favicon());
   if (!favicon.is_valid() || favicon.url().is_empty() ||
       favicon.bitmap().empty()) {
     return;
   }
   std::vector<unsigned char> image_data;
   gfx::PNGCodec::EncodeBGRASkBitmap(favicon.bitmap(), false, &image_data);
@@ skipping 36 matching lines @@
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_FAVICON_UPDATED,
       Source<TabContents>(tab_contents()),
       NotificationService::NoDetails());
   tab_contents()->NotifyNavigationStateChanged(TabContents::INVALIDATE_TAB);
 }
 
 void FaviconTabHelper::NavigateToPendingEntry(
     const GURL& url,
     NavigationController::ReloadType reload_type) {
+  Profile* profile = static_cast<Profile*>(tab_contents()->context());
   if (reload_type != NavigationController::NO_RELOAD &&
-      !tab_contents()->profile()->IsOffTheRecord()) {
+      !profile->IsOffTheRecord()) {
     FaviconService* favicon_service =
-        tab_contents()->profile()->GetFaviconService(Profile::IMPLICIT_ACCESS);
+        profile->GetFaviconService(Profile::IMPLICIT_ACCESS);
     if (favicon_service)
       favicon_service->SetFaviconOutOfDateForPage(url);
   }
 }
 
 void FaviconTabHelper::DidNavigateMainFramePostCommit(
     const content::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
   // Get the favicon, either from history or request it from the net.
   FetchFavicon(details.entry->url());
@@ skipping 11 matching lines @@
 
 void FaviconTabHelper::OnDidDownloadFavicon(int id,
                                             const GURL& image_url,
                                             bool errored,
                                             const SkBitmap& image) {
   gfx::Image favicon(new SkBitmap(image));
   favicon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon);
   if (touch_icon_handler_.get())
     touch_icon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon);
 }