fav icon -> favicon. Pass 5: fav_icon -> favicon

chrome/browser/bookmarks/bookmark_html_writer.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_HTML_WRITER_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_HTML_WRITER_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 61 matching lines @@
                               GURL icon_url);
 
   // The Profile object used for accessing FaviconService, bookmarks model.
   Profile* profile_;
 
   // All URLs that are extracted from bookmarks. Used to fetch favicons
   // for each of them. After favicon is fetched top url is removed from list.
   std::list<std::string> bookmark_urls_;
 
   // Consumer for requesting favicons.
-  CancelableRequestConsumer fav_icon_consumer_;
+  CancelableRequestConsumer favicon_consumer_;
 
   // Map that stores favicon per URL.
   scoped_ptr<URLFaviconMap> favicons_map_;
 
   // Path where html output is stored.
   FilePath path_;
 
   BookmarksExportObserver* observer_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkFaviconFetcher);
 };
 
 namespace bookmark_html_writer {
 
 // Writes the bookmarks out in the 'bookmarks.html' format understood by
 // Firefox and IE. The results are written to the file at |path|.  The file
 // thread is used.
 // Before writing to the file favicons are fetched on the main thread.
 // TODO(sky): need a callback on failure.
 void WriteBookmarks(Profile* profile,
                     const FilePath& path,
                     BookmarksExportObserver* observer);
 
 }  // namespace bookmark_html_writer
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_HTML_WRITER_H_