Introduce ChromeBookmarkClientFactory

chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.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/bookmark_manager_private/bookmark_manager_private_api.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.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/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/user_prefs/user_prefs.h"
 
 // Times out on win syzyasan, http://crbug.com/166026
 #if defined(SYZYASAN)
 #define MAYBE_BookmarkManager DISABLED_BookmarkManager
 #else
 #define MAYBE_BookmarkManager BookmarkManager
 #endif
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_BookmarkManager) {
   // Add managed bookmarks.
   Profile* profile = browser()->profile();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
   ChromeBookmarkClient* client =
-      BookmarkModelFactory::GetChromeBookmarkClientForProfile(profile);
-  BookmarkModel* model = client->model();
+      ChromeBookmarkClientFactory::GetForProfile(profile);
   test::WaitForBookmarkModelToLoad(model);
 
   base::ListValue list;
   base::DictionaryValue* node = new base::DictionaryValue();
   node->SetString("name", "Managed Bookmark");
   node->SetString("url", "http://www.chromium.org");
   list.Append(node);
   node = new base::DictionaryValue();
   node->SetString("name", "Managed Folder");
   node->Set("children", new base::ListValue());
@@ skipping 19 matching lines @@
                 GURL("http://aaa.example.com"));
   model->AddURL(folder, 0, base::ASCIIToUTF16("BBB"),
                 GURL("http://bbb.example.com"));
 
   PrefService* prefs = user_prefs::UserPrefs::Get(profile);
   prefs->SetBoolean(prefs::kEditBookmarksEnabled, false);
 
   ASSERT_TRUE(RunComponentExtensionTest("bookmark_manager/edit_disabled"))
       << message_;
 }