fav icon -> favicon. Pass 7: FavIconID -> FaviconID

chrome/browser/history/url_database_unittest.cc

 // Copyright (c) 2010 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 "app/sql/connection.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 217 matching lines @@
   url_info1.set_title(UTF8ToUTF16("Google"));
   url_info1.set_visit_count(4);
   url_info1.set_typed_count(2);
   url_info1.set_last_visit(Time::Now() - TimeDelta::FromDays(1));
   url_info1.set_hidden(false);
 
   // Insert a row with favicon
   URLID url_id1 = AddURL(url_info1);
   ASSERT_TRUE(url_id1 != 0);
 
-  FavIconID icon_id = 1;
+  FaviconID icon_id = 1;
   sql::Statement statement(GetDB().GetCachedStatement(
       SQL_FROM_HERE,
       "UPDATE urls SET favicon_id =? WHERE id=?"));
 
   ASSERT_TRUE(statement);
 
   statement.BindInt64(0, icon_id);
   statement.BindInt64(1, url_id1);
   ASSERT_TRUE(statement.Run());
 
@@ skipping 13 matching lines @@
   IconMappingEnumerator e;
   InitIconMappingEnumeratorForEverything(&e);
   IconMapping icon_mapping;
   ASSERT_TRUE(e.GetNextIconMapping(&icon_mapping));
   ASSERT_EQ(url1, icon_mapping.page_url);
   ASSERT_EQ(icon_id, icon_mapping.icon_id);
   ASSERT_FALSE(e.GetNextIconMapping(&icon_mapping));
 }
 
 }  // namespace history