Retry r88137:

chrome/browser/favicon/favicon_handler.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_FAVICON_FAVICON_HANDLER_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_
 #pragma once
 
 #include <map>
 
@@ skipping 46 matching lines @@
 //   download the favicon.
 // . Otherwise we ask the history database to update the mapping from
 //   page url to favicon url and call us back with the favicon. Remember, it is
 //   possible for the db to already have the favicon, just not the mapping
 //   between page to favicon url. The callback for this is OnFaviconData.
 //
 // OnFaviconData either updates the favicon of the NavigationEntry (if the
 // db knew about the favicon), or requests the renderer to download the
 // favicon.
 //
-// When the renderer downloads the favicon SetFaviconImageData is invoked,
+// When the renderer downloads the favicon SetFavicon is invoked,
 // at which point we update the favicon of the NavigationEntry and notify
 // the database to save the favicon.
 
 class FaviconHandler {
  public:
   enum Type {
     FAVICON,
     TOUCH,
   };
 
@@ skipping 174 matching lines @@
 
   // The FaviconData from history.
   history::FaviconData history_icon_;
 
   TabContents* tab_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_