Introduce ChromeBookmarkClientFactory

chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc

Index: chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc b/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
index 31d65d4f50b90ad5fdd588a2ba4058b4db62c92a..6ac125e44c9eb52ac439a8c48e671ce2655ea60e 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
+++ b/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
@@ -10,6 +10,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/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/browser/bookmark_model.h"
@@ -50,12 +51,11 @@ class ChromeBookmarkClientTest : public testing::Test {
 
   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,