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

chrome/renderer/favicon_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/renderer/favicon_helper.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/common/chrome_constants.h"
-#include "chrome/common/favicon_url.h"
 #include "chrome/common/icon_messages.h"
+#include "content/public/common/favicon_url.h"
 #include "content/public/renderer/render_view.h"
 #include "net/base/data_url.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "webkit/glue/image_decoder.h"
 #include "webkit/glue/multi_resolution_image_resource_fetcher.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::FaviconURL;
 using WebKit::WebFrame;
 using WebKit::WebIconURL;
 using WebKit::WebVector;
 using WebKit::WebURL;
 using WebKit::WebURLRequest;
 using webkit_glue::MultiResolutionImageResourceFetcher;
 
 static FaviconURL::IconType ToFaviconType(WebIconURL::Type type) {
   switch (type) {
     case WebIconURL::TypeFavicon:
@@ skipping 128 matching lines @@
     return;
 
   WebVector<WebIconURL> icon_urls = frame->iconURLs(icon_type);
   std::vector<FaviconURL> urls;
   for (size_t i = 0; i < icon_urls.size(); i++) {
     urls.push_back(FaviconURL(icon_urls[i].iconURL(),
                               ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(routing_id(), render_view()->GetPageId(), urls);
 }