Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/android/provider/chrome_browser_provider.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/android/provider/chrome_browser_provider.h"
 
 #include <list>
 #include <utility>
 
 #include "base/android/jni_android.h"
@@ skipping 655 matching lines @@
  public:
   BookmarkIconFetchTask(FaviconService* favicon_service,
                         Profile* profile,
                         CancelableRequestConsumer* cancelable_consumer,
                         base::CancelableTaskTracker* cancelable_tracker)
       : FaviconServiceTask(favicon_service,
                            profile,
                            cancelable_consumer,
                            cancelable_tracker) {}
 
-  favicon_base::FaviconBitmapResult Run(const GURL& url) {
+  favicon_base::FaviconRawBitmapResult Run(const GURL& url) {
     RunAsyncRequestOnUIThreadBlocking(
-        base::Bind(&FaviconService::GetRawFaviconForURL,
+        base::Bind(&FaviconService::GetRawFaviconForPageURL,
                    base::Unretained(service()),
-                   FaviconService::FaviconForURLParams(
+                   FaviconService::FaviconForPageURLParams(
                        url,
                        favicon_base::FAVICON | favicon_base::TOUCH_ICON,
                        gfx::kFaviconSize),
                    ResourceBundle::GetSharedInstance().GetMaxScaleFactor(),
                    base::Bind(&BookmarkIconFetchTask::OnFaviconRetrieved,
                               base::Unretained(this)),
                    cancelable_tracker()));
     return result_;
   }
 
  private:
   void OnFaviconRetrieved(
-      const favicon_base::FaviconBitmapResult& bitmap_result) {
+      const favicon_base::FaviconRawBitmapResult& bitmap_result) {
     result_ = bitmap_result;
     RequestCompleted();
   }
 
-  favicon_base::FaviconBitmapResult result_;
+  favicon_base::FaviconRawBitmapResult result_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkIconFetchTask);
 };
 
 // Base class for all asynchronous blocking tasks that use the Android history
 // provider service.
 class HistoryProviderTask
     : public AsyncServiceRequest<AndroidHistoryProviderService> {
  public:
   HistoryProviderTask(AndroidHistoryProviderService* service,
@@ skipping 835 matching lines @@
 ScopedJavaLocalRef<jbyteArray> ChromeBrowserProvider::GetFaviconOrTouchIcon(
     JNIEnv* env, jobject obj, jstring jurl) {
   if (!jurl)
     return ScopedJavaLocalRef<jbyteArray>();
 
   GURL url = GURL(ConvertJavaStringToUTF16(env, jurl));
   BookmarkIconFetchTask favicon_task(favicon_service_.get(),
                                      profile_,
                                      &favicon_consumer_,
                                      &cancelable_task_tracker_);
-  favicon_base::FaviconBitmapResult bitmap_result = favicon_task.Run(url);
+  favicon_base::FaviconRawBitmapResult bitmap_result = favicon_task.Run(url);
 
   if (!bitmap_result.is_valid() || !bitmap_result.bitmap_data.get())
     return ScopedJavaLocalRef<jbyteArray>();
 
   return base::android::ToJavaByteArray(env, bitmap_result.bitmap_data->front(),
                                         bitmap_result.bitmap_data->size());
 }
 
 ScopedJavaLocalRef<jbyteArray> ChromeBrowserProvider::GetThumbnail(
     JNIEnv* env, jobject obj, jstring jurl) {
@@ skipping 52 matching lines @@
     Java_ChromeBrowserProvider_onBookmarkChanged(env, obj.obj());
   } else if (type ==
       chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
     if (obj.is_null())
       return;
     Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj());
   }
 }