Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/ui/webui/ntp/favicon_webui_handler.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/ui/webui/ntp/favicon_webui_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 93 matching lines @@
       base::StringValue dom_id_value(dom_id);
       scoped_ptr<base::StringValue> color(
           SkColorToCss(history::kPrepopulatedPages[i].color));
       web_ui()->CallJavascriptFunction("ntp.setFaviconDominantColor",
                                        dom_id_value, *color);
       return;
     }
   }
 
   dom_id_map_[id_] = dom_id;
-  favicon_service->GetRawFaviconForURL(
-      FaviconService::FaviconForURLParams(
+  favicon_service->GetRawFaviconForPageURL(
+      FaviconService::FaviconForPageURLParams(
           url, favicon_base::FAVICON, gfx::kFaviconSize),
       ui::SCALE_FACTOR_100P,
       base::Bind(&FaviconWebUIHandler::OnFaviconDataAvailable,
                  base::Unretained(this),
                  id_++),
       &cancelable_task_tracker_);
 }
 
 void FaviconWebUIHandler::OnFaviconDataAvailable(
     int id,
-    const favicon_base::FaviconBitmapResult& bitmap_result) {
+    const favicon_base::FaviconRawBitmapResult& bitmap_result) {
   scoped_ptr<base::StringValue> color_value;
 
   if (bitmap_result.is_valid())
     color_value.reset(GetDominantColorCssString(bitmap_result.bitmap_data));
   else
     color_value.reset(new base::StringValue("#919191"));
 
   base::StringValue dom_id(dom_id_map_[id]);
   web_ui()->CallJavascriptFunction("ntp.setFaviconDominantColor",
                                    dom_id, *color_value);
@@ skipping 21 matching lines @@
   if (!gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, true, &bits))
     return;
   scoped_refptr<base::RefCountedStaticMemory> bits_mem(
       new base::RefCountedStaticMemory(&bits.front(), bits.size()));
   scoped_ptr<base::StringValue> color_value(
       GetDominantColorCssString(bits_mem));
   base::StringValue id(extension_id);
   web_ui()->CallJavascriptFunction(
       "ntp.setFaviconDominantColor", id, *color_value);
 }