Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/history/android/sqlite_cursor.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_ANDROID_SQLITE_CURSOR_H_
 #define CHROME_BROWSER_HISTORY_ANDROID_SQLITE_CURSOR_H_
 
 #include <jni.h>
 #include <vector>
 
@@ skipping 135 matching lines @@
   void set_test_observer(TestObserver* test_observer) {
     test_observer_ = test_observer;
   }
 
   // Get Favicon from history backend.
   bool GetFavicon(favicon_base::FaviconID id,
                   std::vector<unsigned char>* image_data);
 
   void GetFaviconForIDInUIThread(
       favicon_base::FaviconID id,
-      const favicon_base::FaviconRawCallback& callback);
+      const favicon_base::FaviconRawBitmapCallback& callback);
 
   // The callback function of FaviconService::GetLargestRawFaviconForID().
-  void OnFaviconData(const favicon_base::FaviconBitmapResult& bitmap_result);
+  void OnFaviconData(const favicon_base::FaviconRawBitmapResult& bitmap_result);
 
   // The callback function of MoveTo().
   void OnMoved(AndroidHistoryProviderService::Handle handle, int pos);
 
   JavaColumnType GetColumnTypeInternal(int column);
 
   // Runs the MoveStatement on UI thread.
   void RunMoveStatementOnUIThread(int pos);
 
   // The current row position, '-1' means the position before the first one.
@@ skipping 12 matching lines @@
   FaviconService* favicon_service_;
 
   // Live on UI thread.
   scoped_ptr<CancelableRequestConsumer> consumer_;
   scoped_ptr<base::CancelableTaskTracker> tracker_;
 
   // The count of result rows.
   int count_;
 
   // The favicon image.
-  favicon_base::FaviconBitmapResult favicon_bitmap_result_;
+  favicon_base::FaviconRawBitmapResult favicon_bitmap_result_;
 
   TestObserver* test_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SQLiteCursor);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_ANDROID_SQLITE_CURSOR_H_