Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/history/android/sqlite_cursor.cc

Index: chrome/browser/history/android/sqlite_cursor.cc
diff --git a/chrome/browser/history/android/sqlite_cursor.cc b/chrome/browser/history/android/sqlite_cursor.cc
index f570c7c52efeaebc41b64fcd9740f4b5da9500ec..ded7dd09c1b32bce03a7bc18fe6463e6ae2fd870 100644
--- a/chrome/browser/history/android/sqlite_cursor.cc
+++ b/chrome/browser/history/android/sqlite_cursor.cc
@@ -203,7 +203,7 @@ bool SQLiteCursor::GetFavicon(favicon_base::FaviconID id,
 
 void SQLiteCursor::GetFaviconForIDInUIThread(
     favicon_base::FaviconID id,
-    const favicon_base::FaviconRawCallback& callback) {
+    const favicon_base::FaviconRawBitmapCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!tracker_.get())
     tracker_.reset(new base::CancelableTaskTracker());
@@ -211,7 +211,7 @@ void SQLiteCursor::GetFaviconForIDInUIThread(
 }
 
 void SQLiteCursor::OnFaviconData(
-    const favicon_base::FaviconBitmapResult& bitmap_result) {
+    const favicon_base::FaviconRawBitmapResult& bitmap_result) {
   favicon_bitmap_result_ = bitmap_result;
   event_.Signal();
   if (test_observer_)