Introduce ChromeBookmarkClientFactory

chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc

Index: chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
index 15dfb90eb1b9d1dede7ef08ebe92d96367156768..79ad3defc0c1c8a79c94bb57442ae5abb45072b6 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
+#include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h"
 #include "chrome/common/extensions/api/bookmarks.h"
 #include "chrome/test/base/testing_profile.h"
@@ -31,9 +32,8 @@ class ExtensionBookmarksTest : public testing::Test {
 
   virtual void SetUp() OVERRIDE {
     profile_.CreateBookmarkModel(false);
-    client_ =
-        BookmarkModelFactory::GetChromeBookmarkClientForProfile(&profile_);
-    model_ = client_->model();
+    model_ = BookmarkModelFactory::GetForProfile(&profile_);
+    client_ = ChromeBookmarkClientFactory::GetForProfile(&profile_);
     test::WaitForBookmarkModelToLoad(model_);
 
     node_ = model_->AddURL(model_->other_node(), 0, base::ASCIIToUTF16("Digg"),
@@ -131,13 +131,14 @@ TEST_F(ExtensionBookmarksTest, GetManagedNode) {
 TEST_F(ExtensionBookmarksTest, RemoveNodeInvalidId) {
   int64 invalid_id = model_->next_node_id();
   std::string error;
-  EXPECT_FALSE(RemoveNode(client_, invalid_id, true, &error));
+  EXPECT_FALSE(RemoveNode(model_, client_, invalid_id, true, &error));
   EXPECT_EQ(keys::kNoNodeError, error);
 }
 
 TEST_F(ExtensionBookmarksTest, RemoveNodePermanent) {
   std::string error;
-  EXPECT_FALSE(RemoveNode(client_, model_->other_node()->id(), true, &error));
+  EXPECT_FALSE(
+      RemoveNode(model_, client_, model_->other_node()->id(), true, &error));
   EXPECT_EQ(keys::kModifySpecialError, error);
 }
 
@@ -148,20 +149,21 @@ TEST_F(ExtensionBookmarksTest, RemoveNodeManaged) {
                      base::ASCIIToUTF16("Chromium"),
                      GURL("http://www.chromium.org"));
   std::string error;
-  EXPECT_FALSE(RemoveNode(client_, managed_bookmark->id(), true, &error));
+  EXPECT_FALSE(
+      RemoveNode(model_, client_, managed_bookmark->id(), true, &error));
   EXPECT_EQ(keys::kModifyManagedError, error);
 }
 
 TEST_F(ExtensionBookmarksTest, RemoveNodeNotRecursive) {
   std::string error;
-  EXPECT_FALSE(RemoveNode(client_, folder_->id(), false, &error));
+  EXPECT_FALSE(RemoveNode(model_, client_, folder_->id(), false, &error));
   EXPECT_EQ(keys::kFolderNotEmptyError, error);
 }
 
 TEST_F(ExtensionBookmarksTest, RemoveNodeRecursive) {
   EXPECT_EQ(3, model_->other_node()->child_count());
   std::string error;
-  EXPECT_TRUE(RemoveNode(client_, folder_->id(), true, &error));
+  EXPECT_TRUE(RemoveNode(model_, client_, folder_->id(), true, &error));
   EXPECT_EQ(2, model_->other_node()->child_count());
 }