fav icon -> favicon. Pass 6: GetFavIcon* -> GetFavicon*

BUG=76073
TEST=none; no visible change

Review URL: http://codereview.chromium.org/6694027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78233 0039d316-1c4b-4281-b951-d872f2087c98

26 files changed, 58 insertions, 58 deletions

diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index 8fe2968..4fac854 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -465,7 +465,7 @@ void HistoryService::UpdateFaviconMappingAndFetch(
 void HistoryService::GetFaviconForURL(
     FaviconService::GetFaviconRequest* request,
     const GURL& page_url) {
-  Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFavIconForURL, NULL, request,
+  Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFaviconForURL, NULL, request,
            page_url, history::FAVICON);
 }
 
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc
index 2d64f60..4beb4c9 100644
--- a/chrome/browser/history/history_backend.cc
+++ b/chrome/browser/history/history_backend.cc
@@ -1600,14 +1600,14 @@ bool HistoryBackend::GetThumbnailFromOlderRedirect(
   return success;
 }
 
-void HistoryBackend::GetFavicon(scoped_refptr<GetFavIconRequest> request,
+void HistoryBackend::GetFavicon(scoped_refptr<GetFaviconRequest> request,
                                 const GURL& icon_url,
                                 int icon_types) {
   UpdateFavIconMappingAndFetchImpl(NULL, icon_url, request, icon_types);
 }
 
 void HistoryBackend::UpdateFavIconMappingAndFetch(
-    scoped_refptr<GetFavIconRequest> request,
+    scoped_refptr<GetFaviconRequest> request,
     const GURL& page_url,
     const GURL& icon_url,
     IconType icon_type) {
@@ -1640,7 +1640,7 @@ void HistoryBackend::SetImportedFavicons(
   std::set<GURL> favicons_changed;
 
   for (size_t i = 0; i < favicon_usage.size(); i++) {
-    FavIconID favicon_id = thumbnail_db_->GetFavIconIDForFavIconURL(
+    FavIconID favicon_id = thumbnail_db_->GetFaviconIDForFaviconURL(
         favicon_usage[i].favicon_url, history::FAVICON, NULL);
     if (!favicon_id) {
       // This favicon doesn't exist yet, so we create it using the given data.
@@ -1695,7 +1695,7 @@ void HistoryBackend::SetImportedFavicons(
 void HistoryBackend::UpdateFavIconMappingAndFetchImpl(
     const GURL* page_url,
     const GURL& icon_url,
-    scoped_refptr<GetFavIconRequest> request,
+    scoped_refptr<GetFaviconRequest> request,
     int icon_types) {
   // Check only a single type was given when the page_url was specified.
   DCHECK(!page_url || (page_url && (icon_types == FAVICON ||
@@ -1711,7 +1711,7 @@ void HistoryBackend::UpdateFavIconMappingAndFetchImpl(
   if (thumbnail_db_.get()) {
     IconType returned_icon_type;
     const FavIconID favicon_id =
-        thumbnail_db_->GetFavIconIDForFavIconURL(
+        thumbnail_db_->GetFaviconIDForFaviconURL(
             icon_url, icon_types, &returned_icon_type);
     if (favicon_id) {
       data = new RefCountedBytes;
@@ -1729,13 +1729,13 @@ void HistoryBackend::UpdateFavIconMappingAndFetchImpl(
     // else case, haven't cached entry yet. Caller is responsible for
     // downloading the favicon and invoking SetFavicon.
   }
-  request->ForwardResult(GetFavIconRequest::TupleType(
+  request->ForwardResult(GetFaviconRequest::TupleType(
                              request->handle(), know_favicon, data, expired,
                              icon_url));
 }
 
-void HistoryBackend::GetFavIconForURL(
-    scoped_refptr<GetFavIconRequest> request,
+void HistoryBackend::GetFaviconForURL(
+    scoped_refptr<GetFaviconRequest> request,
     const GURL& page_url,
     int icon_types) {
   if (request->canceled())
@@ -1763,12 +1763,12 @@ void HistoryBackend::GetFavIconForURL(
           TimeDelta::FromDays(kFavIconRefetchDays);
     }
 
-    UMA_HISTOGRAM_TIMES("History.GetFavIconForURL",
+    UMA_HISTOGRAM_TIMES("History.GetFavIconForURL",  // historical name
                         TimeTicks::Now() - beginning_time);
   }
 
   request->ForwardResult(
-      GetFavIconRequest::TupleType(request->handle(), know_favicon, data,
+      GetFaviconRequest::TupleType(request->handle(), know_favicon, data,
                                    expired, icon_url));
 }
 
@@ -1781,7 +1781,7 @@ void HistoryBackend::SetFavicon(
   if (!thumbnail_db_.get() || !db_.get())
     return;
 
-  FavIconID id = thumbnail_db_->GetFavIconIDForFavIconURL(
+  FavIconID id = thumbnail_db_->GetFaviconIDForFaviconURL(
       icon_url, icon_type, NULL);
   if (!id)
     id = thumbnail_db_->AddFavIcon(icon_url, icon_type);
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h
index 21ec989..f5b653f 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -209,11 +209,11 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
 
   // Favicon -------------------------------------------------------------------
 
-  void GetFavicon(scoped_refptr<GetFavIconRequest> request,
+  void GetFavicon(scoped_refptr<GetFaviconRequest> request,
                   const GURL& icon_url,
                   int icon_types);
 
-  void GetFavIconForURL(scoped_refptr<GetFavIconRequest> request,
+  void GetFaviconForURL(scoped_refptr<GetFaviconRequest> request,
                         const GURL& page_url,
                         int icon_types);
 
@@ -222,7 +222,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
                   scoped_refptr<RefCountedMemory> data,
                   IconType icon_type);
 
-  void UpdateFavIconMappingAndFetch(scoped_refptr<GetFavIconRequest> request,
+  void UpdateFavIconMappingAndFetch(scoped_refptr<GetFaviconRequest> request,
                                     const GURL& page_url,
                                     const GURL& icon_url,
                                     IconType icon_type);
@@ -451,7 +451,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   void UpdateFavIconMappingAndFetchImpl(
       const GURL* page_url,
       const GURL& icon_url,
-      scoped_refptr<GetFavIconRequest> request,
+      scoped_refptr<GetFaviconRequest> request,
       int icon_type);
 
   // Sets the favicon url id for page_url to id. This will also broadcast
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index a1f423c..f518a53 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -323,10 +323,10 @@ TEST_F(HistoryBackendTest, DeleteAll) {
   // We should have a favicon for the first URL only. We look them up by favicon
   // URL since the IDs may hav changed.
   FavIconID out_favicon1 = backend_->thumbnail_db_->
-      GetFavIconIDForFavIconURL(favicon_url1, FAVICON, NULL);
+      GetFaviconIDForFaviconURL(favicon_url1, FAVICON, NULL);
   EXPECT_TRUE(out_favicon1);
   FavIconID out_favicon2 = backend_->thumbnail_db_->
-      GetFavIconIDForFavIconURL(favicon_url2, FAVICON, NULL);
+      GetFaviconIDForFaviconURL(favicon_url2, FAVICON, NULL);
   EXPECT_FALSE(out_favicon2) << "Favicon not deleted";
 
   // The remaining URL should still reference the same favicon, even if its
@@ -399,7 +399,7 @@ TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
   EXPECT_EQ(0U, visits.size());
   // The favicon should still be valid.
   EXPECT_EQ(favicon2,
-      backend_->thumbnail_db_->GetFavIconIDForFavIconURL(favicon_url2,
+      backend_->thumbnail_db_->GetFaviconIDForFaviconURL(favicon_url2,
                                                          FAVICON,
                                                          NULL));
 
@@ -415,7 +415,7 @@ TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
   EXPECT_FALSE(backend_->db_->GetRowForURL(row2.url(), &tmp_url_row));
   // And the favicon should be deleted.
   EXPECT_EQ(0,
-      backend_->thumbnail_db_->GetFavIconIDForFavIconURL(favicon_url2,
+      backend_->thumbnail_db_->GetFaviconIDForFaviconURL(favicon_url2,
                                                          FAVICON,
                                                          NULL));
 
@@ -437,7 +437,7 @@ TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
 
   // The favicon should still be valid.
   EXPECT_EQ(favicon1,
-      backend_->thumbnail_db_->GetFavIconIDForFavIconURL(favicon_url1,
+      backend_->thumbnail_db_->GetFaviconIDForFaviconURL(favicon_url1,
                                                          FAVICON,
                                                          NULL));
 }
@@ -893,7 +893,7 @@ TEST_F(HistoryBackendTest, SetFaviconMapping) {
   const GURL icon_url2("http://www.google.com/icon2");
   backend_->SetFavicon(
       url1, icon_url2, RefCountedBytes::TakeVector(&data), FAVICON);
-  FavIconID icon_id = backend_->thumbnail_db_->GetFavIconIDForFavIconURL(
+  FavIconID icon_id = backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
       icon_url2, FAVICON, NULL);
   EXPECT_NE(0, icon_id);
   std::vector<IconMapping> icon_mapping;
@@ -913,7 +913,7 @@ TEST_F(HistoryBackendTest, AddOrUpdateIconMapping) {
 
   backend_->SetFavicon(
       url, icon_url, RefCountedBytes::TakeVector(&data), FAVICON);
-  FavIconID icon_id = backend_->thumbnail_db_->GetFavIconIDForFavIconURL(
+  FavIconID icon_id = backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
       icon_url, FAVICON, NULL);
 
   // Add the same mapping
diff --git a/chrome/browser/history/history_marshaling.h b/chrome/browser/history/history_marshaling.h
index b270b74..2eff411 100644
--- a/chrome/browser/history/history_marshaling.h
+++ b/chrome/browser/history/history_marshaling.h
@@ -51,7 +51,7 @@ typedef CancelableRequest<HistoryService::ThumbnailDataCallback>
 // Favicons -------------------------------------------------------------------
 
 typedef CancelableRequest<FaviconService::FaviconDataCallback>
-    GetFavIconRequest;
+    GetFaviconRequest;
 
 // Downloads ------------------------------------------------------------------
 
diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc
index c50d998..63cafb2 100644
--- a/chrome/browser/history/thumbnail_database.cc
+++ b/chrome/browser/history/thumbnail_database.cc
@@ -399,7 +399,7 @@ bool ThumbnailDatabase::SetFaviconLastUpdateTime(FavIconID icon_id,
   return statement.Run();
 }
 
-FavIconID ThumbnailDatabase::GetFavIconIDForFavIconURL(const GURL& icon_url,
+FavIconID ThumbnailDatabase::GetFaviconIDForFaviconURL(const GURL& icon_url,
                                                        int required_icon_type,
                                                        IconType* icon_type) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
diff --git a/chrome/browser/history/thumbnail_database.h b/chrome/browser/history/thumbnail_database.h
index e88e737..dbcb2ec 100644
--- a/chrome/browser/history/thumbnail_database.h
+++ b/chrome/browser/history/thumbnail_database.h
@@ -112,7 +112,7 @@ class ThumbnailDatabase {
   // FAVICON, and the icon type is returned in icon_type parameter if it is not
   // NULL.
   // Returns 0 if no entry exists for the specified url.
-  FavIconID GetFavIconIDForFavIconURL(const GURL& icon_url,
+  FavIconID GetFaviconIDForFaviconURL(const GURL& icon_url,
                                       int required_icon_type,
                                       IconType* icon_type);
 
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 5172c67..2a9d74c 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -670,7 +670,7 @@ void TemplateURL::SetFaviconURL(const GURL& url) {
   }
 }
 
-GURL TemplateURL::GetFavIconURL() const {
+GURL TemplateURL::GetFaviconURL() const {
   for (std::vector<ImageRef>::const_iterator i = image_refs_.begin();
        i != image_refs_.end(); ++i) {
     if ((i->type == "image/x-icon" || i->type == "image/vnd.microsoft.icon")
diff --git a/chrome/browser/search_engines/template_url.h b/chrome/browser/search_engines/template_url.h
index 27ea785..b56b8f1 100644
--- a/chrome/browser/search_engines/template_url.h
+++ b/chrome/browser/search_engines/template_url.h
@@ -406,11 +406,11 @@ class TemplateURL {
 
   // Convenience methods for getting/setting an ImageRef that points to a
   // favicon. A TemplateURL need not have an ImageRef for a favicon. In such
-  // a situation GetFavIconURL returns an invalid url.
+  // a situation GetFaviconURL returns an invalid url.
   //
   // If url is empty and there is an image ref for a favicon, it is removed.
   void SetFaviconURL(const GURL& url);
-  GURL GetFavIconURL() const;
+  GURL GetFaviconURL() const;
 
   // Set of languages supported. This may be empty.
   void add_language(const string16& language) {
diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc
index 586d4d0..4d07128 100644
--- a/chrome/browser/search_engines/template_url_fetcher.cc
+++ b/chrome/browser/search_engines/template_url_fetcher.cc
@@ -227,7 +227,7 @@ void TemplateURLFetcher::RequestDelegate::AddSearchProvider() {
   template_url_->set_originating_url(osdd_url_);
 
   // The page may have specified a URL to use for favicons, if not, set it.
-  if (!template_url_->GetFavIconURL().is_valid())
+  if (!template_url_->GetFaviconURL().is_valid())
     template_url_->SetFaviconURL(favicon_url_);
 
   switch (provider_type_) {
diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc
index edaea49..5e3d234 100644
--- a/chrome/browser/search_engines/template_url_model.cc
+++ b/chrome/browser/search_engines/template_url_model.cc
@@ -783,7 +783,7 @@ void TemplateURLModel::SaveDefaultSearchProviderToPrefs(
       suggest_url = t_url->suggestions_url()->url();
     if (t_url->instant_url())
       instant_url = t_url->instant_url()->url();
-    GURL icon_gurl = t_url->GetFavIconURL();
+    GURL icon_gurl = t_url->GetFaviconURL();
     if (!icon_gurl.is_empty())
       icon_url = icon_gurl.spec();
     encodings = JoinString(t_url->input_encodings(), ';');
@@ -879,7 +879,7 @@ static bool TemplateURLsHaveSamePrefs(const TemplateURL* url1,
       TemplateURLRef::SameUrlRefs(url1->url(), url2->url()) &&
       TemplateURLRef::SameUrlRefs(url1->suggestions_url(),
                                   url2->suggestions_url()) &&
-      url1->GetFavIconURL() == url2->GetFavIconURL() &&
+      url1->GetFaviconURL() == url2->GetFaviconURL() &&
       url1->safe_for_autoreplace() == url2->safe_for_autoreplace() &&
       url1->show_in_default_list() == url2->show_in_default_list() &&
       url1->input_encodings() == url2->input_encodings();
diff --git a/chrome/browser/search_engines/template_url_model_unittest.cc b/chrome/browser/search_engines/template_url_model_unittest.cc
index b66d3a0..ba6cafa 100644
--- a/chrome/browser/search_engines/template_url_model_unittest.cc
+++ b/chrome/browser/search_engines/template_url_model_unittest.cc
@@ -160,7 +160,7 @@ class TemplateURLModelTest : public testing::Test {
     ASSERT_EQ(expected.short_name(), actual.short_name());
     ASSERT_EQ(JoinString(expected.input_encodings(), ';'),
               JoinString(actual.input_encodings(), ';'));
-    ASSERT_TRUE(expected.GetFavIconURL() == actual.GetFavIconURL());
+    ASSERT_TRUE(expected.GetFaviconURL() == actual.GetFaviconURL());
     ASSERT_EQ(expected.id(), actual.id());
     ASSERT_EQ(expected.safe_for_autoreplace(), actual.safe_for_autoreplace());
     ASSERT_EQ(expected.show_in_default_list(), actual.show_in_default_list());
@@ -179,7 +179,7 @@ class TemplateURLModelTest : public testing::Test {
     EXPECT_EQ(expected->short_name(), actual->short_name());
     EXPECT_EQ(JoinString(expected->input_encodings(), ';'),
               JoinString(actual->input_encodings(), ';'));
-    EXPECT_TRUE(expected->GetFavIconURL() == actual->GetFavIconURL());
+    EXPECT_TRUE(expected->GetFaviconURL() == actual->GetFaviconURL());
     EXPECT_EQ(expected->safe_for_autoreplace(), actual->safe_for_autoreplace());
     EXPECT_EQ(expected->show_in_default_list(), actual->show_in_default_list());
   }
diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc
index f5dd0b7..c33d955 100644
--- a/chrome/browser/search_engines/template_url_parser.cc
+++ b/chrome/browser/search_engines/template_url_parser.cc
@@ -200,7 +200,7 @@ class ParsingContext {
   // set.
   void DeriveImageFromURL() {
     if (derive_image_from_url_ &&
-        url_->GetFavIconURL().is_empty() && url_->url()) {
+        url_->GetFaviconURL().is_empty() && url_->url()) {
       GURL url(url_->url()->url());  // More url's please...
       url_->SetFaviconURL(TemplateURL::GenerateFaviconURL(url));
     }
diff --git a/chrome/browser/search_engines/template_url_parser_unittest.cc b/chrome/browser/search_engines/template_url_parser_unittest.cc
index c339092..d0fae59 100644
--- a/chrome/browser/search_engines/template_url_parser_unittest.cc
+++ b/chrome/browser/search_engines/template_url_parser_unittest.cc
@@ -86,7 +86,7 @@ TEST_F(TemplateURLParserTest, TestDictionary) {
   ParseFile("dictionary.xml", NULL);
   ASSERT_TRUE(parse_result_);
   EXPECT_EQ(ASCIIToUTF16("Dictionary.com"), template_url_.short_name());
-  EXPECT_TRUE(template_url_.GetFavIconURL() ==
+  EXPECT_TRUE(template_url_.GetFaviconURL() ==
               GURL("http://cache.lexico.com/g/d/favicon.ico"));
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
@@ -100,7 +100,7 @@ TEST_F(TemplateURLParserTest, TestMSDN) {
   ParseFile("msdn.xml", NULL);
   ASSERT_TRUE(parse_result_);
   EXPECT_EQ(ASCIIToUTF16("Search \" MSDN"), template_url_.short_name());
-  EXPECT_TRUE(template_url_.GetFavIconURL() ==
+  EXPECT_TRUE(template_url_.GetFaviconURL() ==
               GURL("http://search.msdn.microsoft.com/search/favicon.ico"));
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
@@ -114,7 +114,7 @@ TEST_F(TemplateURLParserTest, TestWikipedia) {
   ParseFile("wikipedia.xml", NULL);
   ASSERT_TRUE(parse_result_);
   EXPECT_EQ(ASCIIToUTF16("Wikipedia (English)"), template_url_.short_name());
-  EXPECT_TRUE(template_url_.GetFavIconURL() ==
+  EXPECT_TRUE(template_url_.GetFaviconURL() ==
               GURL("http://en.wikipedia.org/favicon.ico"));
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
@@ -175,7 +175,7 @@ TEST_F(TemplateURLParserTest, TestFirefoxEbay) {
   ASSERT_EQ(1U, template_url_.input_encodings().size());
   EXPECT_EQ("ISO-8859-1", template_url_.input_encodings()[0]);
   EXPECT_EQ(GURL("http://search.ebay.com/favicon.ico"),
-            template_url_.GetFavIconURL());
+            template_url_.GetFaviconURL());
 }
 
 TEST_F(TemplateURLParserTest, TestFirefoxWebster) {
@@ -193,7 +193,7 @@ TEST_F(TemplateURLParserTest, TestFirefoxWebster) {
   ASSERT_EQ(1U, template_url_.input_encodings().size());
   EXPECT_EQ("ISO-8859-1", template_url_.input_encodings()[0]);
   EXPECT_EQ(GURL("http://www.webster.com/favicon.ico"),
-            template_url_.GetFavIconURL());
+            template_url_.GetFaviconURL());
 }
 
 TEST_F(TemplateURLParserTest, TestFirefoxYahoo) {
@@ -214,7 +214,7 @@ TEST_F(TemplateURLParserTest, TestFirefoxYahoo) {
   ASSERT_EQ(1U, template_url_.input_encodings().size());
   EXPECT_EQ("UTF-8", template_url_.input_encodings()[0]);
   EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"),
-            template_url_.GetFavIconURL());
+            template_url_.GetFaviconURL());
 }
 
 // Make sure we ignore POST suggestions (this is the same XML file as
@@ -235,5 +235,5 @@ TEST_F(TemplateURLParserTest, TestPostSuggestion) {
   ASSERT_EQ(1U, template_url_.input_encodings().size());
   EXPECT_EQ("UTF-8", template_url_.input_encodings()[0]);
   EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"),
-            template_url_.GetFavIconURL());
+            template_url_.GetFaviconURL());
 }
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
index 1261915..d5a4bcc 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
@@ -123,7 +123,7 @@ TEST_F(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) {
   EXPECT_EQ(ASCIIToUTF16("foo"), t_urls[0]->short_name());
   EXPECT_EQ(ASCIIToUTF16("fook"), t_urls[0]->keyword());
   EXPECT_EQ("foo.com", t_urls[0]->url()->GetHost());
-  EXPECT_EQ("foi.com", t_urls[0]->GetFavIconURL().host());
+  EXPECT_EQ("foi.com", t_urls[0]->GetFaviconURL().host());
   EXPECT_EQ(1u, t_urls[0]->input_encodings().size());
   EXPECT_EQ(1001, t_urls[0]->prepopulate_id());
   EXPECT_EQ(SEARCH_ENGINE_GOOGLE, t_urls[0]->search_engine_type());
diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc
index 80018bc..949c1f8c 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/chrome/browser/search_engines/template_url_unittest.cc
@@ -248,12 +248,12 @@ TEST_F(TemplateURLTest, SetFavicon) {
   GURL favicon_url("http://favicon.url");
   url.SetFaviconURL(favicon_url);
   ASSERT_EQ(1U, url.image_refs().size());
-  ASSERT_TRUE(favicon_url == url.GetFavIconURL());
+  ASSERT_TRUE(favicon_url == url.GetFaviconURL());
 
   GURL favicon_url2("http://favicon2.url");
   url.SetFaviconURL(favicon_url2);
   ASSERT_EQ(1U, url.image_refs().size());
-  ASSERT_TRUE(favicon_url2 == url.GetFavIconURL());
+  ASSERT_TRUE(favicon_url2 == url.GetFaviconURL());
 }
 
 TEST_F(TemplateURLTest, DisplayURLToURLRef) {
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc
index 4cdcda2..cdcccff 100644
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -79,7 +79,7 @@ class ModelEntry {
             Profile::EXPLICIT_ACCESS);
     if (!favicon_service)
       return;
-    GURL favicon_url = template_url().GetFavIconURL();
+    GURL favicon_url = template_url().GetFaviconURL();
     if (!favicon_url.is_valid()) {
       // The favicon url isn't always set. Guess at one here.
       if (template_url_.url() && template_url_.url()->IsValid()) {
diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
index c6494b9..47b38fa 100644
--- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
@@ -255,7 +255,7 @@ bool AppPanelBrowserFrameView::ShouldTabIconViewAnimate() const {
   return current_tab ? current_tab->is_loading() : false;
 }
 
-SkBitmap AppPanelBrowserFrameView::GetFavIconForTabIconView() {
+SkBitmap AppPanelBrowserFrameView::GetFaviconForTabIconView() {
   return frame_->GetWindow()->window_delegate()->GetWindowIcon();
 }
 
diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h
index 2396390..f13496d 100644
--- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h
@@ -62,7 +62,7 @@ class AppPanelBrowserFrameView : public BrowserNonClientFrameView,
 
   // Overridden from TabIconView::TabIconViewModel:
   virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
-  virtual SkBitmap GetFavIconForTabIconView() OVERRIDE;
+  virtual SkBitmap GetFaviconForTabIconView() OVERRIDE;
 
  private:
   // Returns the thickness of the border that makes up the window frame edges.
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index b89ce63..1ec1c4c 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -437,7 +437,7 @@ bool OpaqueBrowserFrameView::ShouldTabIconViewAnimate() const {
   return current_tab ? current_tab->is_loading() : false;
 }
 
-SkBitmap OpaqueBrowserFrameView::GetFavIconForTabIconView() {
+SkBitmap OpaqueBrowserFrameView::GetFaviconForTabIconView() {
   views::WindowDelegate* delegate = frame_->GetWindow()->window_delegate();
   if (!delegate) {
     LOG(WARNING) << "delegate is NULL, returning safe default.";
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
index 945c24f..7305a06 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -73,7 +73,7 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
 
   // Overridden from TabIconView::TabIconViewModel:
   virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
-  virtual SkBitmap GetFavIconForTabIconView() OVERRIDE;
+  virtual SkBitmap GetFaviconForTabIconView() OVERRIDE;
 
  private:
   // Returns the thickness of the border that makes up the window frame edges.
diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc
index 511af61e..d486a87 100644
--- a/chrome/browser/ui/views/tab_icon_view.cc
+++ b/chrome/browser/ui/views/tab_icon_view.cc
@@ -139,7 +139,7 @@ void TabIconView::OnPaint(gfx::Canvas* canvas) {
     rendered = true;
     PaintThrobber(canvas);
   } else {
-    SkBitmap favicon = model_->GetFavIconForTabIconView();
+    SkBitmap favicon = model_->GetFaviconForTabIconView();
     if (!favicon.isNull()) {
       rendered = true;
       PaintFavIcon(canvas, favicon);
diff --git a/chrome/browser/ui/views/tab_icon_view.h b/chrome/browser/ui/views/tab_icon_view.h
index b291303..9080dc4 100644
--- a/chrome/browser/ui/views/tab_icon_view.h
+++ b/chrome/browser/ui/views/tab_icon_view.h
@@ -25,7 +25,7 @@ class TabIconView : public views::View {
     virtual bool ShouldTabIconViewAnimate() const = 0;
 
     // Returns the favicon to display in the icon view
-    virtual SkBitmap GetFavIconForTabIconView() = 0;
+    virtual SkBitmap GetFaviconForTabIconView() = 0;
   };
 
   static void InitializeIfNeeded();
diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc
index 28b1e20..69f0b8d 100644
--- a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc
@@ -154,7 +154,7 @@ DictionaryValue* SearchEngineManagerHandler::CreateDictionaryForEngine(
     index, IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN));
   dict->SetString("url", template_url->url()->DisplayURL());
   dict->SetBoolean("urlLocked", template_url->prepopulate_id() > 0);
-  GURL icon_url = template_url->GetFavIconURL();
+  GURL icon_url = template_url->GetFaviconURL();
   if (icon_url.is_valid())
     dict->SetString("iconURL", icon_url.spec());
   dict->SetString("modelIndex", base::IntToString(index));
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index 5957444..adfa93a7 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -208,12 +208,12 @@ const size_t kMaxDataLength = 1024;
 void BindURLToStatement(const TemplateURL& url, sql::Statement* s) {
   s->BindString(0, UTF16ToUTF8(url.short_name()));
   s->BindString(1, UTF16ToUTF8(url.keyword()));
-  GURL favicon_url = url.GetFavIconURL();
+  GURL favicon_url = url.GetFaviconURL();
   if (!favicon_url.is_valid()) {
     s->BindString(2, std::string());
   } else {
     s->BindString(2, history::HistoryDatabase::GURLToDatabaseURL(
-                       url.GetFavIconURL()));
+                       url.GetFaviconURL()));
   }
   s->BindString(3, url.url() ? url.url()->url() : std::string());
   s->BindInt(4, url.safe_for_autoreplace() ? 1 : 0);
diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc
index 5842fed..2075808 100644
--- a/chrome/browser/webdata/web_database_unittest.cc
+++ b/chrome/browser/webdata/web_database_unittest.cc
@@ -353,7 +353,7 @@ TEST_F(WebDatabaseTest, Keywords) {
 
   EXPECT_FALSE(restored_url->autogenerate_keyword());
 
-  EXPECT_TRUE(favicon_url == restored_url->GetFavIconURL());
+  EXPECT_TRUE(favicon_url == restored_url->GetFaviconURL());
 
   EXPECT_TRUE(restored_url->safe_for_autoreplace());
 
@@ -447,7 +447,7 @@ TEST_F(WebDatabaseTest, UpdateKeyword) {
 
   EXPECT_TRUE(restored_url->autogenerate_keyword());
 
-  EXPECT_TRUE(favicon_url == restored_url->GetFavIconURL());
+  EXPECT_TRUE(favicon_url == restored_url->GetFaviconURL());
 
   EXPECT_TRUE(restored_url->safe_for_autoreplace());
 
@@ -497,7 +497,7 @@ TEST_F(WebDatabaseTest, KeywordWithNoFavicon) {
 
   EXPECT_EQ(template_url.short_name(), restored_url->short_name());
   EXPECT_EQ(template_url.keyword(), restored_url->keyword());
-  EXPECT_TRUE(!restored_url->GetFavIconURL().is_valid());
+  EXPECT_TRUE(!restored_url->GetFaviconURL().is_valid());
   EXPECT_TRUE(restored_url->safe_for_autoreplace());
   EXPECT_EQ(GetID(&template_url), GetID(restored_url));
   delete restored_url;