Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/notifications/message_center_settings_controller.cc

 // Copyright (c) 2013 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/notifications/message_center_settings_controller.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/string_compare.h"
@@ skipping 270 matching lines @@
 
     std::string url_pattern = iter->primary_pattern.ToString();
     base::string16 name = base::UTF8ToUTF16(url_pattern);
     GURL url(url_pattern);
     NotifierId notifier_id(url);
     notifiers->push_back(new Notifier(
         notifier_id,
         name,
         notification_service->IsNotifierEnabled(notifier_id)));
     patterns_[name] = iter->primary_pattern;
-    FaviconService::FaviconForURLParams favicon_params(
+    FaviconService::FaviconForPageURLParams favicon_params(
         url,
         favicon_base::FAVICON | favicon_base::TOUCH_ICON,
         message_center::kSettingsIconSize);
     // Note that favicon service obtains the favicon from history. This means
     // that it will fail to obtain the image if there are no history data for
     // that URL.
-    favicon_service->GetFaviconImageForURL(
+    favicon_service->GetFaviconImageForPageURL(
         favicon_params,
         base::Bind(&MessageCenterSettingsController::OnFaviconLoaded,
-                   base::Unretained(this), url),
+                   base::Unretained(this),
+                   url),
         favicon_tracker_.get());
   }
 
   // Screenshot notification feature is only for ChromeOS. See crbug.com/238358
 #if defined(OS_CHROMEOS)
   const base::string16 screenshot_name =
       l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_NOTIFIER_SCREENSHOT_NAME);
   NotifierId screenshot_notifier_id(
       NotifierId::SYSTEM_COMPONENT, ash::system_notifier::kNotifierScreenshot);
   Notifier* const screenshot_notifier = new Notifier(
@@ skipping 233 matching lines @@
     // creating a primary profile, and causes an infinite loop.
     // Thus, it would be better to delay creating group for guest login.
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(
             &MessageCenterSettingsController::CreateNotifierGroupForGuestLogin,
             weak_factory_.GetWeakPtr()));
   }
 #endif
 }