Adds support for saving favicon size into history database.

chrome/browser/extensions/extension_web_ui.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/extension_web_ui.h"
 
 #include <set>
 #include <vector>
 
 #include "base/string_util.h"
@@ skipping 94 matching lines @@
                          ImageLoadingTracker::DONT_CACHE);
     } else {
       ForwardResult(NULL);
     }
   }
 
   virtual void OnImageLoaded(const gfx::Image& image,
                              const std::string& extension_id,
                              int index) OVERRIDE {
     if (!image.IsEmpty()) {
-      std::vector<unsigned char> image_data;
+      std::vector<unsigned char> bitmap_data;
       if (!gfx::PNGCodec::EncodeBGRASkBitmap(*image.ToSkBitmap(), false,
-                                             &image_data)) {
+                                             &bitmap_data)) {
         NOTREACHED() << "Could not encode extension favicon";
       }
-      ForwardResult(base::RefCountedBytes::TakeVector(&image_data));
+      ForwardResult(base::RefCountedBytes::TakeVector(&bitmap_data));
     } else {
       ForwardResult(NULL);
     }
   }
 
  private:
   ~ExtensionWebUIImageLoadingTracker() {}
 
   // Forwards the result on the request. If no favicon was available then
   // |icon_data| may be backed by NULL. Once the result has been forwarded the
   // instance is deleted.
   void ForwardResult(scoped_refptr<base::RefCountedMemory> icon_data) {
     history::FaviconData favicon;
     favicon.known_icon = icon_data.get() != NULL && icon_data->size() > 0;
-    favicon.image_data = icon_data;
+    favicon.bitmap_data = icon_data;
     favicon.icon_type = history::FAVICON;
     request_->ForwardResultAsync(request_->handle(), favicon);
     delete this;
   }
 
   ImageLoadingTracker tracker_;
   scoped_refptr<FaviconService::GetFaviconRequest> request_;
   const Extension* extension_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionWebUIImageLoadingTracker);
@@ skipping 274 matching lines @@
 }
 
 // static
 void ExtensionWebUI::GetFaviconForURL(Profile* profile,
     FaviconService::GetFaviconRequest* request, const GURL& page_url) {
   // tracker deletes itself when done.
   ExtensionWebUIImageLoadingTracker* tracker =
       new ExtensionWebUIImageLoadingTracker(profile, request, page_url);
   tracker->Init();
 }