Move chrome/common/favicon_url.(cc|h) into content/

chrome/browser/ui/metro_pin_tab_helper_win.h

Index: chrome/browser/ui/metro_pin_tab_helper_win.h
diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.h b/chrome/browser/ui/metro_pin_tab_helper_win.h
index 45b157368da2a98c5ad691fcb2ef7143f2ce972a..c5fb01ade87a4945bc10ac06677346b98b4506c8 100644
--- a/chrome/browser/ui/metro_pin_tab_helper_win.h
+++ b/chrome/browser/ui/metro_pin_tab_helper_win.h
@@ -9,9 +9,9 @@
 
 #include "chrome/browser/favicon/favicon_download_helper.h"
 #include "chrome/browser/favicon/favicon_download_helper_delegate.h"
-#include "chrome/common/favicon_url.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
+#include "content/public/common/favicon_url.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image_skia.h"
 
@@ -42,8 +42,9 @@ class MetroPinTabHelper
   friend class content::WebContentsUserData<MetroPinTabHelper>;
 
   // FaviconDownloadHelperDelegate overrides.
-  void OnUpdateFaviconURL(int32 page_id,
-                          const std::vector<FaviconURL>& candidates) OVERRIDE;
+  void OnUpdateFaviconURL(
+      int32 page_id,
+      const std::vector<content::FaviconURL>& candidates) OVERRIDE;
 
   void OnDidDownloadFavicon(int id,
                             const GURL& image_url,
@@ -57,7 +58,7 @@ class MetroPinTabHelper
   void FaviconDownloaderFinished();
 
   // Candidate Favicon URLs for the current page.
-  std::vector<FaviconURL> favicon_url_candidates_;
+  std::vector<content::FaviconURL> favicon_url_candidates_;
 
   // The currently active FaviconChooser, if there is one.
   scoped_ptr<FaviconChooser> favicon_chooser_;