Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / history / android / android_provider_backend.h

diff --git a/src/chrome/browser/history/android/android_provider_backend.h b/src/chrome/browser/history/android/android_provider_backend.h
index 02dff9b..bc9552d 100644 (file)
--- a/src/chrome/browser/history/android/android_provider_backend.h
+++ b/src/chrome/browser/history/android/android_provider_backend.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_HISTORY_ANDROID_ANDROID_PROVIDER_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_ANDROID_ANDROID_PROVIDER_BACKEND_H_
 
+#include <list>
 #include <set>
 
 #include "base/containers/hash_tables.h"
@@ -14,10 +15,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/history/android/android_cache_database.h"
-#include "chrome/browser/history/android/android_history_types.h"
 #include "chrome/browser/history/android/sql_handler.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_notifications.h"
+#include "components/history/core/android/android_history_types.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
@@ -146,23 +147,7 @@ class AndroidProviderBackend {
   FRIEND_TEST_ALL_PREFIXES(AndroidProviderBackendTest, UpdateTables);
   FRIEND_TEST_ALL_PREFIXES(AndroidProviderBackendTest, UpdateSearchTermTable);
 
-  class HistoryNotifications {
-   public:
-    HistoryNotifications();
-    ~HistoryNotifications();
-
-    void PushBack(int type, scoped_ptr<HistoryDetails> detail);
-    int PopBackType();
-    scoped_ptr<HistoryDetails> PopBackDetails();
-
-    bool empty() const { return types_.empty(); }
-
-   private:
-    std::vector<int> types_;
-    ScopedVector<HistoryDetails> details_;
-
-    DISALLOW_COPY_AND_ASSIGN(HistoryNotifications);
-  };
+  typedef std::list<base::Closure> HistoryNotifications;
 
   // The scoped transaction for AndroidProviderBackend.
   //