Move favicon callbacks to favicon_base

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>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/common/cancelable_request.h"
-#include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/android/android_history_provider_service.h"
 #include "chrome/browser/history/history_types.h"
+#include "components/favicon_base/favicon_callback.h"
+
+class FaviconService;
 
 // This class is JNI implementation of
 // org.chromium.chrome.database.SqliteCursor, it uses the AndroidStatement to
 // iterate among the result rows. This is not thread safe, all methods should
 // be called from the same non-UI thread which typical is the Java thread.
 //
 // This class can not be in history namespace because the class name has to
 // match to the generated sqlite_cursor_jni.h.
 class SQLiteCursor {
  public:
@@ skipping 112 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 FaviconService::FaviconRawCallback& callback);
+      const favicon_base::FaviconRawCallback& callback);
 
   // The callback function of FaviconService::GetLargestRawFaviconForID().
   void OnFaviconData(const favicon_base::FaviconBitmapResult& bitmap_result);
 
   // The callback function of MoveTo().
   void OnMoved(AndroidHistoryProviderService::Handle handle, int pos);
 
   JavaColumnType GetColumnTypeInternal(int column);
 
   // Runs the MoveStatement on UI thread.
@@ skipping 23 matching lines @@
 
   // The favicon image.
   favicon_base::FaviconBitmapResult favicon_bitmap_result_;
 
   TestObserver* test_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SQLiteCursor);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_ANDROID_SQLITE_CURSOR_H_