move favicon download code from chrome/ into content/

chrome/browser/ui/metro_pin_tab_helper_win.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/ui/metro_pin_tab_helper_win.h"
 
 #include <set>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/metro.h"
-#include "chrome/browser/favicon/favicon_download_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/icon_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "crypto/sha2.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/color_analysis.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
@@ skipping 324 matching lines @@
   // Once this happens this downloader has done its job, so delete it.
   if (in_progress_requests_.empty())
     UseChosenCandidate();
 }
 
 void MetroPinTabHelper::FaviconChooser::AddPendingRequest(int request_id) {
   in_progress_requests_.insert(request_id);
 }
 
 MetroPinTabHelper::MetroPinTabHelper(content::WebContents* web_contents)
-    : content::WebContentsObserver(web_contents),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          favicon_download_helper_(web_contents, this)) {
+    : content::WebContentsObserver(web_contents) {
 }
 
 MetroPinTabHelper::~MetroPinTabHelper() {}
 
 bool MetroPinTabHelper::IsPinned() const {
   HMODULE metro_module = base::win::GetMetroModule();
   if (!metro_module)
     return false;
 
   typedef BOOL (*MetroIsPinnedToStartScreen)(const string16&);
@@ skipping 34 matching lines @@
 
   favicon_chooser_.reset(new FaviconChooser(this, title, url_str, favicon));
 
   if (favicon_url_candidates_.empty()) {
     favicon_chooser_->UseChosenCandidate();
     return;
   }
 
   // Request all the candidates.
   int image_size = 0; // Request the full sized image.
-  for (std::vector<FaviconURL>::const_iterator iter =
+  for (std::vector<content::FaviconURL>::const_iterator iter =
            favicon_url_candidates_.begin();
        iter != favicon_url_candidates_.end();
        ++iter) {
     favicon_chooser_->AddPendingRequest(
-        favicon_download_helper_.DownloadFavicon(iter->icon_url, image_size));
+        web_contents()->DownloadFavicon(iter->icon_url, image_size,
+            base::Bind(&MetroPinTabHelper::DidDownloadFavicon,
+                       base::Unretained(this))));
   }
 
 }
 
 void MetroPinTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& /*details*/,
     const content::FrameNavigateParams& /*params*/) {
   // Cancel any outstanding pin operations once the user navigates away from
   // the page.
   if (favicon_chooser_.get())
     favicon_chooser_.reset();
   // Any candidate favicons we have are now out of date so clear them.
   favicon_url_candidates_.clear();
 }
 
-void MetroPinTabHelper::OnUpdateFaviconURL(
+void MetroPinTabHelper::DidUpdateFaviconURL(
     int32 page_id,
-    const std::vector<FaviconURL>& candidates) {
+    const std::vector<content::FaviconURL>& candidates) {
   favicon_url_candidates_ = candidates;
 }
 
-void MetroPinTabHelper::OnDidDownloadFavicon(
+void MetroPinTabHelper::DidDownloadFavicon(
     int id,
     const GURL& image_url,
     bool errored,
     int requested_size,
     const std::vector<SkBitmap>& bitmaps) {
   if (favicon_chooser_.get()) {
     favicon_chooser_->UpdateCandidate(id, image_url, errored,
                                       requested_size, bitmaps);
   }
 }
@@ skipping 13 matching lines @@
 
   GURL url = web_contents()->GetURL();
   string16 tile_id = GenerateTileId(UTF8ToUTF16(url.spec()));
   metro_un_pin_from_start_screen(tile_id,
                                  base::Bind(&PinPageReportUmaCallback));
 }
 
 void MetroPinTabHelper::FaviconDownloaderFinished() {
   favicon_chooser_.reset();
 }