Change FaviconData to be able to return data for multiple bitmaps for same icon URL

chrome/browser/history/android/sqlite_cursor.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/history/android/sqlite_cursor.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chrome/browser/history/android/android_history_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/SQLiteCursor_jni.h"
+#include "ui/gfx/favicon_size.h"
 #include "sql/statement.h"
 
 using base::android::ConvertUTF8ToJavaString;
 using base::android::GetClass;
 using base::android::HasClass;
 using base::android::HasMethod;
 using base::android::GetMethodID;
 using base::android::ScopedJavaLocalRef;
 using content::BrowserThread;
 
@@ skipping 191 matching lines @@
         FROM_HERE,
         base::Bind(&SQLiteCursor::GetFaviconForIDInUIThread,
                    base::Unretained(this), id, &consumer_,
                    base::Bind(&SQLiteCursor::OnFaviconData,
                               base::Unretained(this))));
 
     if (test_observer_)
       test_observer_->OnPostGetFaviconTask();
 
     event_.Wait();
-    if (!favicon_.is_valid())
+    if (!favicon_bitmap_result_.is_valid())
       return false;
 
-    image_data->assign(favicon_.image_data->front(),
-        favicon_.image_data->front() + favicon_.image_data->size());
+    scoped_refptr<base::RefCountedMemory> bitmap_data =
+        favicon_bitmap_result_.bitmap_data;
+    image_data->assign(bitmap_data->front(),
+                       bitmap_data->front() + bitmap_data->size());
     return true;
   }
 
   return false;
 }
 
 void SQLiteCursor::GetFaviconForIDInUIThread(
     history::FaviconID id,
     CancelableRequestConsumerBase* consumer,
-    const FaviconService::FaviconDataCallback& callback) {
+    const FaviconService::FaviconRawCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  favicon_service_->GetFaviconForID(id, consumer, callback);
+  favicon_service_->GetRawFaviconForID(id, gfx::kFaviconSize,
+      ui::SCALE_FACTOR_100P, consumer, callback);
 }
 
 
-void SQLiteCursor::OnFaviconData(FaviconService::Handle handle,
-                                 history::FaviconData favicon) {
-  favicon_ = favicon;
+void SQLiteCursor::OnFaviconData(
+    FaviconService::Handle handle,
+    const history::FaviconBitmapResult& bitmap_result) {
+  favicon_bitmap_result_ = bitmap_result;
   event_.Signal();
   if (test_observer_)
     test_observer_->OnGetFaviconResult();
 }
 
 void SQLiteCursor::OnMoved(AndroidHistoryProviderService::Handle handle,
                            int pos) {
   position_ = pos;
   event_.Signal();
   if (test_observer_)
@@ skipping 13 matching lines @@
     return SQLiteCursor::BLOB;
 
   return ToJavaColumnType(statement_->statement()->ColumnType(column));
 }
 
 void SQLiteCursor::RunMoveStatementOnUIThread(int pos) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   service_->MoveStatement(statement_, position_, pos, &consumer_,
                 base::Bind(&SQLiteCursor::OnMoved, base::Unretained(this)));
 }