Introduce BookmarkClient interface to abstract embedder

chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc

Index: chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc
diff --git a/chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc
index cbded0f01903cbaceaaea0da2df54fd7591cac90..ca88f819292c9850bfabf4d8801d0ba5addbf848 100644
--- a/chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/test_bookmark_client.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -16,27 +17,29 @@ using base::ASCIIToUTF16;
 namespace {
 
 TEST(BookmarkUIUtilsTest, HasBookmarkURLs) {
-  BookmarkModel model(NULL, false);
+  test::TestBookmarkClient client;
+  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
 
   std::vector<const BookmarkNode*> nodes;
 
   // This tests that |nodes| contains an URL.
-  const BookmarkNode* page1 = model.AddURL(model.bookmark_bar_node(), 0,
-                                           ASCIIToUTF16("Google"),
-                                           GURL("http://google.com"));
+  const BookmarkNode* page1 = model->AddURL(model->bookmark_bar_node(),
+                                            0,
+                                            ASCIIToUTF16("Google"),
+                                            GURL("http://google.com"));
   nodes.push_back(page1);
   EXPECT_TRUE(chrome::HasBookmarkURLs(nodes));
 
   nodes.clear();
 
   // This tests that |nodes| does not contain any URL.
-  const BookmarkNode* folder1 = model.AddFolder(model.bookmark_bar_node(), 0,
-                                                ASCIIToUTF16("Folder1"));
+  const BookmarkNode* folder1 =
+      model->AddFolder(model->bookmark_bar_node(), 0, ASCIIToUTF16("Folder1"));
   nodes.push_back(folder1);
   EXPECT_FALSE(chrome::HasBookmarkURLs(nodes));
 
   // This verifies if HasBookmarkURLs iterates through immediate children.
-  model.AddURL(folder1, 0, ASCIIToUTF16("Foo"), GURL("http://randomsite.com"));
+  model->AddURL(folder1, 0, ASCIIToUTF16("Foo"), GURL("http://randomsite.com"));
   EXPECT_TRUE(chrome::HasBookmarkURLs(nodes));
 
   // This verifies that HasBookmarkURLS does not iterate through descendants.
@@ -45,53 +48,56 @@ TEST(BookmarkUIUtilsTest, HasBookmarkURLs) {
   // folder to create a two level hierarchy.
 
   // But first we have to remove the URL from |folder1|.
-  model.Remove(folder1, 0);
+  model->Remove(folder1, 0);
 
-  const BookmarkNode* subfolder1 = model.AddFolder(folder1, 0,
-                                                   ASCIIToUTF16("Subfolder1"));
+  const BookmarkNode* subfolder1 =
+      model->AddFolder(folder1, 0, ASCIIToUTF16("Subfolder1"));
 
   // Now add the URL to that |subfolder1|.
-  model.AddURL(subfolder1, 0, ASCIIToUTF16("BAR"), GURL("http://bar-foo.com"));
+  model->AddURL(subfolder1, 0, ASCIIToUTF16("BAR"), GURL("http://bar-foo.com"));
   EXPECT_FALSE(chrome::HasBookmarkURLs(nodes));
 }
 
 TEST(BookmarkUIUtilsTest, HasBookmarkURLsAllowedInIncognitoMode) {
-  BookmarkModel model(NULL, false);
+  test::TestBookmarkClient client;
+  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
   TestingProfile profile;
 
   std::vector<const BookmarkNode*> nodes;
 
   // This tests that |nodes| contains an disabled-in-incognito URL.
-  const BookmarkNode* page1 = model.AddURL(model.bookmark_bar_node(), 0,
-                                           ASCIIToUTF16("BookmarkManager"),
-                                           GURL("chrome://bookmarks"));
+  const BookmarkNode* page1 = model->AddURL(model->bookmark_bar_node(),
+                                            0,
+                                            ASCIIToUTF16("BookmarkManager"),
+                                            GURL("chrome://bookmarks"));
   nodes.push_back(page1);
   EXPECT_FALSE(chrome::HasBookmarkURLsAllowedInIncognitoMode(nodes, &profile));
   nodes.clear();
 
   // This tests that |nodes| contains an URL that can be opened in incognito
   // mode.
-  const BookmarkNode* page2 = model.AddURL(model.bookmark_bar_node(), 0,
-                                           ASCIIToUTF16("Google"),
-                                           GURL("http://google.com"));
+  const BookmarkNode* page2 = model->AddURL(model->bookmark_bar_node(),
+                                            0,
+                                            ASCIIToUTF16("Google"),
+                                            GURL("http://google.com"));
   nodes.push_back(page2);
   EXPECT_TRUE(chrome::HasBookmarkURLsAllowedInIncognitoMode(nodes, &profile));
 
   nodes.clear();
 
   // This tests that |nodes| does not contain any URL.
-  const BookmarkNode* folder1 = model.AddFolder(model.bookmark_bar_node(), 0,
-                                                ASCIIToUTF16("Folder1"));
+  const BookmarkNode* folder1 =
+      model->AddFolder(model->bookmark_bar_node(), 0, ASCIIToUTF16("Folder1"));
   nodes.push_back(folder1);
   EXPECT_FALSE(chrome::HasBookmarkURLsAllowedInIncognitoMode(nodes, &profile));
 
   // This verifies if HasBookmarkURLsAllowedInIncognitoMode iterates through
   // immediate children.
   // Add disabled-in-incognito url.
-  model.AddURL(folder1, 0, ASCIIToUTF16("Foo"), GURL("chrome://bookmarks"));
+  model->AddURL(folder1, 0, ASCIIToUTF16("Foo"), GURL("chrome://bookmarks"));
   EXPECT_FALSE(chrome::HasBookmarkURLsAllowedInIncognitoMode(nodes, &profile));
   // Add normal url.
-  model.AddURL(folder1, 0, ASCIIToUTF16("Foo"), GURL("http://randomsite.com"));
+  model->AddURL(folder1, 0, ASCIIToUTF16("Foo"), GURL("http://randomsite.com"));
   EXPECT_TRUE(chrome::HasBookmarkURLsAllowedInIncognitoMode(nodes, &profile));
 
   // This verifies that HasBookmarkURLsAllowedInIncognitoMode does not iterate
@@ -101,13 +107,13 @@ TEST(BookmarkUIUtilsTest, HasBookmarkURLsAllowedInIncognitoMode) {
   // folder to create a two level hierarchy.
 
   // But first we have to remove the URL from |folder1|.
-  model.Remove(folder1, 0);
+  model->Remove(folder1, 0);
 
-  const BookmarkNode* subfolder1 = model.AddFolder(folder1, 0,
-                                                   ASCIIToUTF16("Subfolder1"));
+  const BookmarkNode* subfolder1 =
+      model->AddFolder(folder1, 0, ASCIIToUTF16("Subfolder1"));
 
   // Now add the URL to that |subfolder1|.
-  model.AddURL(subfolder1, 0, ASCIIToUTF16("BAR"), GURL("http://bar-foo.com"));
+  model->AddURL(subfolder1, 0, ASCIIToUTF16("BAR"), GURL("http://bar-foo.com"));
   EXPECT_FALSE(chrome::HasBookmarkURLsAllowedInIncognitoMode(nodes, &profile));
 }