fav icon -> favicon. Pass 12/12: all the rest

BUG=76073
TEST=test; no visible change

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

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

7 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 943edcf..7cdb2c7 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -394,7 +394,7 @@ ExtensionFunctionDispatcher::ExtensionFunctionDispatcher(
   // If the extension has permission to load chrome://favicon/ resources we need
   // to make sure that the FaviconSource is registered with the
   // ChromeURLDataManager.
-  if (extension->HasHostPermission(GURL(chrome::kChromeUIFavIconURL))) {
+  if (extension->HasHostPermission(GURL(chrome::kChromeUIFaviconURL))) {
     FaviconSource* favicon_source = new FaviconSource(profile_);
     profile_->GetChromeURLDataManager()->AddDataSource(favicon_source);
   }
diff --git a/chrome/browser/extensions/extension_history_api_constants.cc b/chrome/browser/extensions/extension_history_api_constants.cc
index b04b7eb..c5c75b0 100644
--- a/chrome/browser/extensions/extension_history_api_constants.cc
+++ b/chrome/browser/extensions/extension_history_api_constants.cc
@@ -8,7 +8,7 @@ namespace extension_history_api_constants {
 
 const char kAllHistoryKey[] = "allHistory";
 const char kEndTimeKey[] = "endTime";
-const char kFavIconUrlKey[] = "favIconUrl";
+const char kFaviconUrlKey[] = "favIconUrl";
 const char kIdKey[] = "id";
 const char kLastVisitdKey[] = "lastVisitTime";
 const char kMaxResultsKey[] = "maxResults";
diff --git a/chrome/browser/extensions/extension_history_api_constants.h b/chrome/browser/extensions/extension_history_api_constants.h
index 6417b9e..74ac859 100644
--- a/chrome/browser/extensions/extension_history_api_constants.h
+++ b/chrome/browser/extensions/extension_history_api_constants.h
@@ -13,7 +13,7 @@ namespace extension_history_api_constants {
 // Keys.
 extern const char kAllHistoryKey[];
 extern const char kEndTimeKey[];
-extern const char kFavIconUrlKey[];
+extern const char kFaviconUrlKey[];
 extern const char kIdKey[];
 extern const char kLastVisitdKey[];
 extern const char kMaxResultsKey[];
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index a66e300..5b062d3 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -136,7 +136,7 @@ DictionaryValue* ExtensionTabUtil::CreateTabValue(
     NavigationEntry* entry = contents->controller().GetActiveEntry();
     if (entry) {
       if (entry->favicon().is_valid())
-        result->SetString(keys::kFavIconUrlKey, entry->favicon().url().spec());
+        result->SetString(keys::kFaviconUrlKey, entry->favicon().url().spec());
     }
   }
 
diff --git a/chrome/browser/extensions/extension_tabs_module_constants.cc b/chrome/browser/extensions/extension_tabs_module_constants.cc
index f23edae..bde76c5 100644
--- a/chrome/browser/extensions/extension_tabs_module_constants.cc
+++ b/chrome/browser/extensions/extension_tabs_module_constants.cc
@@ -8,7 +8,7 @@ namespace extension_tabs_module_constants {
 
 const char kAllFramesKey[] = "allFrames";
 const char kCodeKey[] = "code";
-const char kFavIconUrlKey[] = "favIconUrl";
+const char kFaviconUrlKey[] = "favIconUrl";
 const char kFileKey[] = "file";
 const char kFocusedKey[] = "focused";
 const char kFormatKey[] = "format";
diff --git a/chrome/browser/extensions/extension_tabs_module_constants.h b/chrome/browser/extensions/extension_tabs_module_constants.h
index 231dbb8..1a979ae 100644
--- a/chrome/browser/extensions/extension_tabs_module_constants.h
+++ b/chrome/browser/extensions/extension_tabs_module_constants.h
@@ -13,7 +13,7 @@ namespace extension_tabs_module_constants {
 // Keys used in serializing tab data & events.
 extern const char kAllFramesKey[];
 extern const char kCodeKey[];
-extern const char kFavIconUrlKey[];
+extern const char kFaviconUrlKey[];
 extern const char kFileKey[];
 extern const char kFocusedKey[];
 extern const char kFormatKey[];
diff --git a/chrome/browser/extensions/permissions_apitest.cc b/chrome/browser/extensions/permissions_apitest.cc
index 33adfe2..e298a093 100644
--- a/chrome/browser/extensions/permissions_apitest.cc
+++ b/chrome/browser/extensions/permissions_apitest.cc
@@ -17,7 +17,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PermissionsFail) {
   ASSERT_TRUE(RunExtensionTest("permissions/disabled")) << message_;
 
   // Since the experimental APIs require a flag, this will fail even though
-  // It's enabled.
+  // it's enabled.
   // TODO(erikkay) This test is currently broken because LoadExtension in
   // ExtensionBrowserTest doesn't actually fail, it just times out.  To fix this
   // I'll need to add an EXTENSION_LOAD_ERROR notification, which is probably
@@ -38,12 +38,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ExperimentalPermissionsFail) {
       << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FavIconPermission) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FaviconPermission) {
   ASSERT_TRUE(RunExtensionTest("permissions/favicon")) << message_;
 }
 
 // Test functions and APIs that are always allowed (even if you ask for no
-// permissions.
+// permissions).
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlwaysAllowed) {
   ASSERT_TRUE(RunExtensionTest("permissions/always_allowed")) << message_;
 }