Upstream version 7.36.149.0

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

diff --git a/src/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc b/src/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
index df3deb2..d1c443a 100644 (file)
--- a/src/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
+++ b/src/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
@@ -6,15 +6,15 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/bookmarks/bookmark_test_helpers.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "components/bookmarks/core/browser/bookmark_model.h"
+#include "components/bookmarks/core/test/bookmark_test_helpers.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
@@ -80,7 +80,7 @@ TEST_F(BookmarkModelSQLHandlerTest, InsertIntoMobileFolder) {
   HistoryAndBookmarkRow row;
   row.set_raw_url("http://bookmark.com");
   row.set_url(GURL("http://bookmark.com"));
-  row.set_title(UTF8ToUTF16("Bookmark Title"));
+  row.set_title(base::UTF8ToUTF16("Bookmark Title"));
   row.set_is_bookmark(true);
 
   BookmarkModelSQLHandler handler(&history_db_);
@@ -99,7 +99,7 @@ TEST_F(BookmarkModelSQLHandlerTest, InsertIntoSpecificFolder) {
   HistoryAndBookmarkRow row;
   row.set_raw_url("http://bookmark.com");
   row.set_url(GURL("http://bookmark.com"));
-  row.set_title(UTF8ToUTF16("Bookmark Title"));
+  row.set_title(base::UTF8ToUTF16("Bookmark Title"));
   row.set_is_bookmark(true);
   // Set other folder as parent.
   row.set_parent_id(bookmark_model_->other_node()->id());
@@ -119,7 +119,7 @@ TEST_F(BookmarkModelSQLHandlerTest, InsertIntoSpecificFolder) {
 TEST_F(BookmarkModelSQLHandlerTest, UpdateHistoryToBookmark) {
   // Added a row in url database.
   URLRow url_row(GURL("http://www.google.com"));
-  url_row.set_title(UTF8ToUTF16("Google"));
+  url_row.set_title(base::UTF8ToUTF16("Google"));
   URLID url_id = history_db_.AddURL(url_row);
   ASSERT_TRUE(url_id);
 
@@ -182,7 +182,7 @@ TEST_F(BookmarkModelSQLHandlerTest, UpdateHistoryToBookmark) {
   EXPECT_EQ(row.parent_id(), parent1->id());
 
   // Only update the title.
-  url_row.set_title(UTF8ToUTF16("Google Inc."));
+  url_row.set_title(base::UTF8ToUTF16("Google Inc."));
   history_db_.UpdateURLRow(url_id, url_row);
   HistoryAndBookmarkRow update_title;
   update_title.set_title(url_row.title());
@@ -212,7 +212,7 @@ TEST_F(BookmarkModelSQLHandlerTest, Delete) {
   GURL url1 = GURL("http://bookmark.com");
   row.set_raw_url("http://bookmark.com");
   row.set_url(url1);
-  row.set_title(UTF8ToUTF16("Bookmark Title"));
+  row.set_title(base::UTF8ToUTF16("Bookmark Title"));
   row.set_is_bookmark(true);
 
   BookmarkModelSQLHandler handler(&history_db_);