Add favicon integration tests for FaviconDriverImpl

components/favicon/content/content_favicon_driver.cc

 // Copyright 2015 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 "components/favicon/content/content_favicon_driver.h"
 
 #include "base/bind.h"
 #include "components/favicon/content/favicon_url_util.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon/core/favicon_url.h"
 #include "components/history/core/browser/history_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/common/favicon_url.h"
 #include "ui/gfx/image/image.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(favicon::ContentFaviconDriver);
 
 namespace favicon {
+namespace {
+
+#if defined(OS_ANDROID)
+const bool kEnableTouchIcon = true;
+#else
+const bool kEnableTouchIcon = false;
+#endif
+
+}  // namespace
 
 // static
 void ContentFaviconDriver::CreateForWebContents(
     content::WebContents* web_contents,
     FaviconService* favicon_service,
     history::HistoryService* history_service,
     bookmarks::BookmarkModel* bookmark_model) {
   if (FromWebContents(web_contents))
     return;
 
@@ skipping 33 matching lines @@
   content::NavigationEntry* entry = controller.GetTransientEntry();
   if (entry)
     return entry->GetFavicon().image;
 
   entry = controller.GetLastCommittedEntry();
   if (entry)
     return entry->GetFavicon().image;
   return gfx::Image();
 }
 
-bool ContentFaviconDriver::FaviconIsValid() const {
-  const content::NavigationController& controller =
-      web_contents()->GetController();
-  content::NavigationEntry* entry = controller.GetTransientEntry();
-  if (entry)
-    return entry->GetFavicon().valid;
-
-  entry = controller.GetLastCommittedEntry();
-  if (entry)
-    return entry->GetFavicon().valid;
-
-  return false;
-}
-
-GURL ContentFaviconDriver::GetActiveURL() {
-  content::NavigationEntry* entry =
-      web_contents()->GetController().GetLastCommittedEntry();
-  return entry ? entry->GetURL() : GURL();
-}
-
 ContentFaviconDriver::ContentFaviconDriver(
     content::WebContents* web_contents,
     FaviconService* favicon_service,
     history::HistoryService* history_service,
     bookmarks::BookmarkModel* bookmark_model)
     : content::WebContentsObserver(web_contents),
-      FaviconDriverImpl(favicon_service, history_service, bookmark_model) {
-}
+      FaviconDriverImpl(kEnableTouchIcon,
+                        favicon_service,
+                        history_service,
+                        bookmark_model) {}
 
 ContentFaviconDriver::~ContentFaviconDriver() {
 }
 
 int ContentFaviconDriver::DownloadImage(const GURL& url,
                                         int max_image_size,
                                         ImageDownloadCallback callback) {
   if (WasUnableToDownloadFavicon(url)) {
     DVLOG(1) << "Skip Failed FavIcon: " << url;
     return 0;
   }
 
-  bool bypass_cache = (bypass_cache_page_url_ == GetActiveURL());
+  content::NavigationEntry* entry =
+      web_contents()->GetController().GetLastCommittedEntry();
+  const GURL active_url = entry ? entry->GetURL() : GURL();
+
+  bool bypass_cache = (bypass_cache_page_url_ == active_url);
   bypass_cache_page_url_ = GURL();
 
   return web_contents()->DownloadImage(url, true, max_image_size, bypass_cache,
                                        callback);
 }
 
 bool ContentFaviconDriver::IsOffTheRecord() {
   DCHECK(web_contents());
   return web_contents()->GetBrowserContext()->IsOffTheRecord();
 }
@@ skipping 69 matching lines @@
   // redownloaded.
   GURL url = navigation_handle->GetURL();
   if (url != bypass_cache_page_url_)
     bypass_cache_page_url_ = GURL();
 
   // Get the favicon, either from history or request it from the net.
   FetchFavicon(url);
 }
 
 }  // namespace favicon