Fix componentization of chrome/browser/bookmarks

chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm

 // 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 <stack>
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.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/bookmarks/managed_bookmark_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
+#include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 using bookmarks::BookmarkExpandedStateTracker;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 @interface BookmarkEditorBaseController ()
 
 // Return the folder tree object for the given path.
@@ skipping 464 matching lines @@
         break;
       }
       ++i;
     }
   }
   DCHECK([path length] == stackSize);
   return path;
 }
 
 - (NSMutableArray*)addChildFoldersFromNode:(const BookmarkNode*)node {
-  ChromeBookmarkClient* client =
-      ChromeBookmarkClientFactory::GetForProfile(profile_);
+  bookmarks::ManagedBookmarkService* managed =
+      ManagedBookmarkServiceFactory::GetForProfile(profile_);
   NSMutableArray* childFolders = nil;
   int childCount = node->child_count();
   for (int i = 0; i < childCount; ++i) {
     const BookmarkNode* childNode = node->GetChild(i);
     if (childNode->is_folder() && childNode->IsVisible() &&
-        client->CanBeEditedByUser(childNode)) {
+        managed->CanBeEditedByUser(childNode)) {
       NSString* childName = base::SysUTF16ToNSString(childNode->GetTitle());
       NSMutableArray* children = [self addChildFoldersFromNode:childNode];
       BookmarkFolderInfo* folderInfo =
           [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:childName
                                                     folderNode:childNode
                                                       children:children];
       if (!childFolders)
         childFolders = [NSMutableArray arrayWithObject:folderInfo];
       else
         [childFolders addObject:folderInfo];
@@ skipping 189 matching lines @@
 }
 
 // Implementing isEqual: allows the NSTreeController to preserve the selection
 // and open/shut state of outline items when the data changes.
 - (BOOL)isEqual:(id)other {
   return [other isKindOfClass:[BookmarkFolderInfo class]] &&
       folderNode_ == [(BookmarkFolderInfo*)other folderNode];
 }
 
 @end