Introduce ChromeBookmarkClientFactory

chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc

 // Copyright 2014 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/bookmarks/chrome_bookmark_client.h"
 
 #include "base/macros.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/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/bookmarks/test/mock_bookmark_model_observer.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "grit/components_strings.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 20 matching lines @@
     ASSERT_TRUE(client_->managed_node()->parent() == model_->root_node());
     EXPECT_NE(-1, model_->root_node()->GetIndexOf(client_->managed_node()));
   }
 
   virtual void TearDown() OVERRIDE {
     model_->RemoveObserver(&observer_);
   }
 
   void ResetModel() {
     profile_.CreateBookmarkModel(false);
-    client_ =
-        BookmarkModelFactory::GetChromeBookmarkClientForProfile(&profile_);
-    ASSERT_TRUE(client_);
-    model_ = client_->model();
+    model_ = BookmarkModelFactory::GetForProfile(&profile_);
     test::WaitForBookmarkModelToLoad(model_);
     model_->AddObserver(&observer_);
+    client_ = ChromeBookmarkClientFactory::GetForProfile(&profile_);
+    DCHECK(client_);
   }
 
   static base::DictionaryValue* CreateBookmark(const std::string& title,
                                                const std::string& url) {
     EXPECT_TRUE(GURL(url).is_valid());
     base::DictionaryValue* dict = new base::DictionaryValue();
     dict->SetString("name", title);
     dict->SetString("url", GURL(url).spec());
     return dict;
   }
@@ skipping 206 matching lines @@
   const BookmarkNode* managed_node = client_->managed_node()->GetChild(0);
   ASSERT_TRUE(managed_node);
 
   std::vector<const BookmarkNode*> nodes;
   EXPECT_FALSE(client_->HasDescendantsOfManagedNode(nodes));
   nodes.push_back(user_node);
   EXPECT_FALSE(client_->HasDescendantsOfManagedNode(nodes));
   nodes.push_back(managed_node);
   EXPECT_TRUE(client_->HasDescendantsOfManagedNode(nodes));
 }