Fix componentization of chrome/browser/bookmarks

chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_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.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
-#include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
+#include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
@@ skipping 17 matching lines @@
   // Singleton object to act as a representedObject for the "choose another
   // folder" item in the pop up.
   static ChooseAnotherFolder* object = nil;
   if (!object) {
     object = [[ChooseAnotherFolder alloc] init];
   }
   return object;
 }
 
 - (id)initWithParentWindow:(NSWindow*)parentWindow
-                    client:(ChromeBookmarkClient*)client
+                   managed:(bookmarks::ManagedBookmarkService*)managed
                      model:(BookmarkModel*)model
                       node:(const BookmarkNode*)node
          alreadyBookmarked:(BOOL)alreadyBookmarked {
-  DCHECK(client);
+  DCHECK(managed);
   DCHECK(node);
   if ((self = [super initWithWindowNibPath:@"BookmarkBubble"
                               parentWindow:parentWindow
                                 anchoredAt:NSZeroPoint])) {
-    client_ = client;
+    managed_ = managed;
     model_ = model;
     node_ = node;
     alreadyBookmarked_ = alreadyBookmarked;
   }
   return self;
 }
 
 - (void)awakeFromNib {
   [super awakeFromNib];
 
@@ skipping 23 matching lines @@
     [[self window] setFrame:bubbleFrame display:YES];
   }
 }
 
 // If this is a new bookmark somewhere visible (e.g. on the bookmark
 // bar), pulse it.  Else, call ourself recursively with our parent
 // until we find something visible to pulse.
 - (void)startPulsingBookmarkButton:(const BookmarkNode*)node  {
   while (node) {
     if ((node->parent() == model_->bookmark_bar_node()) ||
-        (node->parent() == client_->managed_node()) ||
-        (node->parent() == client_->supervised_node()) ||
+        (node->parent() == managed_->managed_node()) ||
+        (node->parent() == managed_->supervised_node()) ||
         (node == model_->other_node())) {
       pulsingBookmarkNode_ = node;
       bookmarkObserver_->StartObservingNode(pulsingBookmarkNode_);
       NSValue *value = [NSValue valueWithPointer:node];
       NSDictionary *dict = [NSDictionary
                              dictionaryWithObjectsAndKeys:value,
                              bookmark_button::kBookmarkKey,
                              [NSNumber numberWithBool:YES],
                              bookmark_button::kBookmarkPulseFlagKey,
                              nil];
@@ skipping 251 matching lines @@
     NSMenuItem* item = [menu addItemWithTitle:title
                                        action:NULL
                                 keyEquivalent:@""];
     [item setRepresentedObject:[NSValue valueWithPointer:parent]];
     [item setIndentationLevel:indentation];
     ++indentation;
   }
   for (int i = 0; i < parent->child_count(); i++) {
     const BookmarkNode* child = parent->GetChild(i);
     if (child->is_folder() && child->IsVisible() &&
-        client_->CanBeEditedByUser(child)) {
+        managed_->CanBeEditedByUser(child)) {
       [self addFolderNodes:child
              toPopUpButton:button
                indentation:indentation];
     }
   }
 }
 
 - (void)setTitle:(NSString*)title parentFolder:(const BookmarkNode*)parent {
   [nameTextField_ setStringValue:title];
   [self setParentFolderSelection:parent];
 }
 
 // Pick a specific parent node in the selection by finding the right
 // pop up button index.
 - (void)setParentFolderSelection:(const BookmarkNode*)parent {
   // Expectation: There is a parent mapping for all items in the
   // folderPopUpButton except the last one ("Choose another folder...").
   NSMenu* menu = [folderPopUpButton_ menu];
   NSValue* parentValue = [NSValue valueWithPointer:parent];
   NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];
   DCHECK(idx != -1);
   [folderPopUpButton_ selectItemAtIndex:idx];
 }
 
 - (NSPopUpButton*)folderPopUpButton {
   return folderPopUpButton_;
 }
 
 @end  // implementation BookmarkBubbleController(ExposedForUnitTesting)