Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / history / android / sqlite_cursor.cc

diff --git a/src/chrome/browser/history/android/sqlite_cursor.cc b/src/chrome/browser/history/android/sqlite_cursor.cc
index 9fd16ce..b255385 100644 (file)
--- a/src/chrome/browser/history/android/sqlite_cursor.cc
+++ b/src/chrome/browser/history/android/sqlite_cursor.cc
@@ -9,7 +9,8 @@
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/logging.h"
-#include "chrome/browser/history/android/android_history_types.h"
+#include "chrome/browser/favicon/favicon_service.h"
+#include "components/history/core/android/android_history_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/SQLiteCursor_jni.h"
 #include "sql/statement.h"
@@ -166,13 +167,12 @@ void SQLiteCursor::DestroyOnUIThread() {
   // Consumer requests were set in the UI thread. They must be cancelled
   // using the same thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  consumer_.reset();
   tracker_.reset();
   service_->CloseStatement(statement_);
   delete this;
 }
 
-bool SQLiteCursor::GetFavicon(chrome::FaviconID id,
+bool SQLiteCursor::GetFavicon(favicon_base::FaviconID id,
                               std::vector<unsigned char>* image_data) {
   if (id) {
     BrowserThread::PostTask(
@@ -201,25 +201,23 @@ bool SQLiteCursor::GetFavicon(chrome::FaviconID id,
 }
 
 void SQLiteCursor::GetFaviconForIDInUIThread(
-    chrome::FaviconID id,
-    const FaviconService::FaviconRawCallback& callback) {
+    favicon_base::FaviconID id,
+    const favicon_base::FaviconRawBitmapCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!tracker_.get())
     tracker_.reset(new base::CancelableTaskTracker());
   favicon_service_->GetLargestRawFaviconForID(id, callback, tracker_.get());
 }
 
-
 void SQLiteCursor::OnFaviconData(
-    const chrome::FaviconBitmapResult& bitmap_result) {
+    const favicon_base::FaviconRawBitmapResult& bitmap_result) {
   favicon_bitmap_result_ = bitmap_result;
   event_.Signal();
   if (test_observer_)
     test_observer_->OnGetFaviconResult();
 }
 
-void SQLiteCursor::OnMoved(AndroidHistoryProviderService::Handle handle,
-                           int pos) {
+void SQLiteCursor::OnMoved(int pos) {
   position_ = pos;
   event_.Signal();
   if (test_observer_)
@@ -236,9 +234,12 @@ SQLiteCursor::JavaColumnType SQLiteCursor::GetColumnTypeInternal(int column) {
 
 void SQLiteCursor::RunMoveStatementOnUIThread(int pos) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (!consumer_.get())
-    consumer_.reset(new CancelableRequestConsumer());
+  if (!tracker_.get())
+    tracker_.reset(new base::CancelableTaskTracker());
   service_->MoveStatement(
-      statement_, position_, pos, consumer_.get(),
-      base::Bind(&SQLiteCursor::OnMoved, base::Unretained(this)));
+      statement_,
+      position_,
+      pos,
+      base::Bind(&SQLiteCursor::OnMoved, base::Unretained(this)),
+      tracker_.get());
 }