Upstream version 7.36.149.0

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

diff --git a/src/chrome/browser/history/in_memory_url_index.cc b/src/chrome/browser/history/in_memory_url_index.cc
index 54235bb..71a58c8 100644 (file)
--- a/src/chrome/browser/history/in_memory_url_index.cc
+++ b/src/chrome/browser/history/in_memory_url_index.cc
@@ -7,9 +7,7 @@
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/bookmarks/bookmark_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service.h"
@@ -18,6 +16,7 @@
 #include "chrome/browser/history/url_index_private_data.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
+#include "components/bookmarks/core/browser/bookmark_model.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
@@ -43,8 +42,8 @@ void InitializeSchemeWhitelist(std::set<std::string>* whitelist) {
   whitelist->insert(std::string(content::kChromeUIScheme));
   whitelist->insert(std::string(content::kFileScheme));
   whitelist->insert(std::string(content::kFtpScheme));
-  whitelist->insert(std::string(content::kHttpScheme));
-  whitelist->insert(std::string(content::kHttpsScheme));
+  whitelist->insert(std::string(url::kHttpScheme));
+  whitelist->insert(std::string(url::kHttpsScheme));
   whitelist->insert(std::string(content::kMailToScheme));
 }