Move favicon callbacks to favicon_base

Move FaviconImageCallback, FaviconResultsCallback and FaviconRawCallback
to favicon_base, those types are shared between favicon and history
components (methods are declared in FaviconService, but it delegates the
work to HistoryService) and only uses types from base:: and
favicon_base:: namespaces.

Also BookmarkClient::FaviconImageCallback is a copy of
FaviconService::FaviconImageCallback, replace it with favicon_base::
version.

BUG=372321
TBR=thakis for //chrome outside of //chrome/browser/history,
//chrome/browser/favicon

Review URL: https://codereview.chromium.org/291643002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272065 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 34 insertions, 1 deletions

diff --git a/components/favicon_base/favicon_callback.h b/components/favicon_base/favicon_callback.h
new file mode 100644
index 0000000..437c4ec
--- /dev/null
+++ b/components/favicon_base/favicon_callback.h
@@ -0,0 +1,33 @@
+// Copyright 2014 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 COMPONENTS_FAVICON_BASE_FAVICON_CALLBACK_H_
+#define COMPONENTS_FAVICON_BASE_FAVICON_CALLBACK_H_
+
+#include <vector>
+
+#include "base/callback.h"
+
+namespace favicon_base {
+
+struct FaviconBitmapResult;
+struct FaviconImageResult;
+
+// Callback for functions that can be used to return a |gfx::Image| and the
+// |GURL| it is loaded from. They are returned as a |FaviconImageResult| object.
+typedef base::Callback<void(const FaviconImageResult&)> FaviconImageCallback;
+
+// Callback for functions returning raw data for a favicon. In
+// |FaviconBitmapResult|, the data is not yet converted as a |gfx::Image|.
+typedef base::Callback<void(const FaviconBitmapResult&)> FaviconRawCallback;
+
+// Callback for functions returning raw data for a favicon in multiple
+// resolution. In |FaviconBitmapResult|, the data is not yet converted as a
+// |gfx::Image|.
+typedef base::Callback<void(const std::vector<FaviconBitmapResult>&)>
+    FaviconResultsCallback;
+
+}  // namespace favicon_base
+
+#endif  // COMPONENTS_FAVICON_BASE_FAVICON_CALLBACK_H_
diff --git a/components/favicon_base/favicon_types.h b/components/favicon_base/favicon_types.h
index 7f4a7b2..34fd57e 100644
--- a/components/favicon_base/favicon_types.h
+++ b/components/favicon_base/favicon_types.h
@@ -72,6 +72,6 @@ struct FaviconBitmapResult {
 // HistoryBackend::SetFavicons().
 typedef FaviconBitmapResult FaviconBitmapData;
 
-}  // namespace chrome
+}  // namespace favicon_base
 
 #endif  // COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_