Limit access to ChromeBookmarkClient to bookmarks code

chrome/browser/sync/test/integration/bookmarks_helper.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/sync/test/integration/bookmarks_helper.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task/cancelable_task_tracker.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/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
 #include "chrome/browser/sync/test/integration/multi_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 339 matching lines @@
       node_b->parent()->GetIndexOf(node_b)) {
     LOG(ERROR) << "Index mismatch: "
                << node_a->parent()->GetIndexOf(node_a) << " vs. "
                << node_b->parent()->GetIndexOf(node_b);
     return false;
   }
   return true;
 }
 
 // Helper for BookmarkModelsMatch.
-bool NodeCantBeSynced(bookmarks::BookmarkClient* client,
+bool NodeCantBeSynced(bookmarks::BookmarkModel* model,
                       const BookmarkNode* node) {
   // Return true to skip a node.
-  return !client->CanSyncNode(node);
+  return !model->CanSyncNode(node);
 }
 
 // Checks if the hierarchies in |model_a| and |model_b| are equivalent in
 // terms of the data model and favicon. Returns true if they both match.
 // Note: Some peripheral fields like creation times are allowed to mismatch.
 bool BookmarkModelsMatch(BookmarkModel* model_a, BookmarkModel* model_b) {
   bool ret_val = true;
   ui::TreeNodeIterator<const BookmarkNode> iterator_a(
-      model_a->root_node(), base::Bind(&NodeCantBeSynced, model_a->client()));
+      model_a->root_node(), base::Bind(&NodeCantBeSynced, model_a));
   ui::TreeNodeIterator<const BookmarkNode> iterator_b(
-      model_b->root_node(), base::Bind(&NodeCantBeSynced, model_b->client()));
+      model_b->root_node(), base::Bind(&NodeCantBeSynced, model_b));
   while (iterator_a.has_next()) {
     const BookmarkNode* node_a = iterator_a.Next();
     if (!iterator_b.has_next()) {
       LOG(ERROR) << "Models do not match.";
       return false;
     }
     const BookmarkNode* node_b = iterator_b.Next();
     ret_val = ret_val && NodesMatch(node_a, node_b);
     if (node_a->is_folder() || node_b->is_folder())
       continue;
@@ skipping 47 matching lines @@
 
 const BookmarkNode* GetOtherNode(int index) {
   return GetBookmarkModel(index)->other_node();
 }
 
 const BookmarkNode* GetSyncedBookmarksNode(int index) {
   return GetBookmarkModel(index)->mobile_node();
 }
 
 const BookmarkNode* GetManagedNode(int index) {
-  return ChromeBookmarkClientFactory::GetForProfile(
-      sync_datatype_helper::test()->GetProfile(index))->managed_node();
+  return BookmarkModelFactory::GetForProfile(
+             sync_datatype_helper::test()->GetProfile(index))->managed_node();
 }
 
 BookmarkModel* GetVerifierBookmarkModel() {
   return BookmarkModelFactory::GetForProfile(
       sync_datatype_helper::test()->verifier());
 }
 
 const BookmarkNode* AddURL(int profile,
                            const std::string& title,
                            const GURL& url) {
@@ skipping 479 matching lines @@
 
 std::string IndexedSubfolderName(int i) {
   return base::StringPrintf("Subfolder Name %d", i);
 }
 
 std::string IndexedSubsubfolderName(int i) {
   return base::StringPrintf("Subsubfolder Name %d", i);
 }
 
 }  // namespace bookmarks_helper