Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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_bar_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 2438 matching lines @@
 }
 
 #pragma mark BookmarkBarToolbarViewController Protocol
 
 - (int)currentTabContentsHeight {
   BrowserWindowController* browserController =
       [BrowserWindowController browserWindowControllerForView:[self view]];
   return NSHeight([[browserController tabContentArea] frame]);
 }
 
-- (ThemeService*)themeService {
-  return ThemeServiceFactory::GetForProfile(browser_->profile());
+- (Profile*)profile {

[groby-ooo-7-16, 2015/12/11 02:32:00]

Do we need this method at all?

The protocol is only implemented by BookmarkBarController, which already exposes
a -browser method...

[Evan Stade, 2015/12/11 19:36:58]

but where it's used, it's cast as a BookmarkBarToolbarViewController, not a
BrowserWindowController

+  return browser_->profile();
 }
 
 #pragma mark BookmarkButtonDelegate Protocol
 
 - (void)fillPasteboard:(NSPasteboard*)pboard
        forDragOfButton:(BookmarkButton*)button {
   [[self folderTarget] fillPasteboard:pboard forDragOfButton:button];
 }
 
 // BookmarkButtonDelegate protocol implementation.  When menus are
@@ skipping 467 matching lines @@
 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
     (const BookmarkNode*)node {
   // See if it's in the bar, then if it is in the hierarchy of visible
   // folder menus.
   if (bookmarkModel_->bookmark_bar_node() == node)
     return self;
   return [folderController_ controllerForNode:node];
 }
 
 @end