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

chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.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 <vector>
 
 #include "base/file_path.h"
 #include "base/time.h"
 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/common/favicon_url.h"
 #include "chrome/common/icon_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/favicon_url.h"
 #include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::FaviconURL;
+
 namespace {
 
 // Observer class to determine when favicons have completed loading.
 class ContentsObserver : public content::WebContentsObserver {
  public:
   explicit ContentsObserver(content::WebContents* web_contents)
       : content::WebContentsObserver(web_contents),
         got_favicons_(false) {
   }
 
@@ skipping 154 matching lines @@
   NavigateTo("launcher-smallfavicon.html");
   EXPECT_TRUE(WaitForFaviconDownloads());
   EXPECT_TRUE(favicon_loader->GetFavicon().empty());
   ASSERT_NO_FATAL_FAILURE(ResetDownloads());
 
   NavigateTo("launcher-largefavicon.html");
   EXPECT_TRUE(WaitForFaviconDownloads());
   EXPECT_FALSE(favicon_loader->GetFavicon().empty());
   EXPECT_EQ(128, favicon_loader->GetFavicon().height());
 }