Introduce ChromeBookmarkClientFactory

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #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"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace keys = bookmark_api_constants;
 using api::bookmarks::BookmarkTreeNode;
 
 namespace bookmark_api_helpers {
 
 class ExtensionBookmarksTest : public testing::Test {
  public:
   ExtensionBookmarksTest()
       : client_(NULL), model_(NULL), node_(NULL), folder_(NULL) {}
 
   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"),
                            GURL("http://www.reddit.com"));
     model_->AddURL(model_->other_node(), 0, base::ASCIIToUTF16("News"),
                    GURL("http://www.foxnews.com"));
     folder_ = model_->AddFolder(
         model_->other_node(), 0, base::ASCIIToUTF16("outer folder"));
     model_->AddFolder(folder_, 0, base::ASCIIToUTF16("inner folder 1"));
     model_->AddFolder(folder_, 0, base::ASCIIToUTF16("inner folder 2"));
@@ skipping 77 matching lines @@
                           false,    // Recurse.
                           false));  // Only folders.
   EXPECT_EQ("Chromium", tree->title);
   EXPECT_EQ("http://www.chromium.org/", *tree->url);
   EXPECT_EQ(BookmarkTreeNode::UNMODIFIABLE_MANAGED, tree->unmodifiable);
 }
 
 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);
 }
 
 TEST_F(ExtensionBookmarksTest, RemoveNodeManaged) {
   const BookmarkNode* managed_bookmark =
       model_->AddURL(client_->managed_node(),
                      0,
                      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());
 }
 
 }  // namespace bookmark_api_helpers
 }  // namespace extensions