Removes usage of NavigationEntry from favicon_handler.*

chrome/browser/favicon/favicon_tab_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/favicon/favicon_tab_helper.h"
 
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
@@ skipping 149 matching lines @@
       content::Source<WebContents>(web_contents()),
       content::Details<bool>(&icon_url_changed));
   web_contents()->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TAB);
 }
 
 bool FaviconTabHelper::IsOffTheRecord() {
   DCHECK(web_contents());
   return web_contents()->GetBrowserContext()->IsOffTheRecord();
 }
 
+const GURL FaviconTabHelper::GetActiveURL() {
+  NavigationEntry* entry = web_contents()->GetController().GetActiveEntry();
+  if (!entry || entry->GetURL().is_empty())
+    return GURL();
+  return entry->GetURL();
+}
+
+const GURL FaviconTabHelper::GetActiveFaviconURL() {
+  return GURL();

[blundell, 2014/05/06 15:04:00]

could you implement these so we can see the full CL?

[jif, 2014/05/09 14:17:18]

Done.

+}
+
+bool FaviconTabHelper::GetActiveFaviconValidity() {
+  return false;
+}
+
+void FaviconTabHelper::SetActiveFaviconValidity(bool validity) {
+  web_contents()->GetController().GetActiveEntry()->GetFavicon().valid =

[blundell, 2014/05/06 15:04:00]

the active entry can be NULL. You probably want a helper method that gets the
entry and then just short-circuit out if it's NULL (or alternatively DCHECK
not-NULL if some of these have a contract that they should only be called when
there's an active entry).

[jif, 2014/05/09 14:17:18]

Done.

+      validity;
+}
+
+void FaviconTabHelper::SetActiveFaviconImage(gfx::Image image) {
+  web_contents()->GetController().GetActiveEntry()->GetFavicon().image = image;
+}
+
+void FaviconTabHelper::SetActiveFaviconURL(GURL url) {
+  web_contents()->GetController().GetActiveEntry()->GetFavicon().url = url;
+}
+
 void FaviconTabHelper::DidStartNavigationToPendingEntry(
     const GURL& url,
     NavigationController::ReloadType reload_type) {
   if (reload_type != NavigationController::NO_RELOAD &&
       !profile_->IsOffTheRecord()) {
     FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
         profile_, Profile::IMPLICIT_ACCESS);
     if (favicon_service) {
       favicon_service->SetFaviconOutOfDateForPage(url);
       if (reload_type == NavigationController::RELOAD_IGNORING_CACHE)
@@ skipping 45 matching lines @@
       favicon_service->UnableToDownloadFavicon(image_url);
   }
 
   favicon_handler_->OnDidDownloadFavicon(
       id, image_url, bitmaps, original_bitmap_sizes);
   if (touch_icon_handler_.get()) {
     touch_icon_handler_->OnDidDownloadFavicon(
         id, image_url, bitmaps, original_bitmap_sizes);
   }
 }