Rejigger ThemeService: move exposure of ThemeProvider interface to a

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

 // Copyright (c) 2011 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_toolbar_view.h"
 
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
@@ skipping 28 matching lines @@
       [controller_ isAnimatingToState:BookmarkBar::DETACHED] ||
       [controller_ isAnimatingFromState:BookmarkBar::DETACHED]) {
     [self drawAsDetachedBubble:dirtyRect];
   } else {
     [self drawBackground:dirtyRect];
   }
 }
 
 - (void)drawAsDetachedBubble:(NSRect)dirtyRect {
   CGFloat morph = [controller_ detachedMorphProgress];
-  ThemeService* themeService = [controller_ themeService];
-  if (!themeService)
+  Profile* profile = [controller_ profile];
+  if (!profile)
     return;
 
   [[NSColor whiteColor] set];
   NSRectFill(dirtyRect);
 
   // Overlay with a lighter background color.
   NSColor* toolbarColor = skia::SkColorToCalibratedNSColor(
-      chrome::GetDetachedBookmarkBarBackgroundColor(themeService));
+      chrome::GetDetachedBookmarkBarBackgroundColor(profile));
   CGFloat alpha = morph * [toolbarColor alphaComponent];
   [[toolbarColor colorWithAlphaComponent:alpha] set];
   NSRectFillUsingOperation(dirtyRect, NSCompositeSourceOver);
 
   // Fade in/out the background.
   {
     gfx::ScopedNSGraphicsContextSaveGState bgScopedState;
     NSGraphicsContext* context = [NSGraphicsContext currentContext];
     CGContextRef cgContext = static_cast<CGContextRef>([context graphicsPort]);
     CGContextSetAlpha(cgContext, 1 - morph);
     CGContextBeginTransparencyLayer(cgContext, NULL);
     [self drawBackground:dirtyRect];
     CGContextEndTransparencyLayer(cgContext);
   }
 
   // Bottom stroke.
   NSRect strokeRect = [self bounds];
   strokeRect.size.height = [self cr_lineWidth];
   if (NSIntersectsRect(strokeRect, dirtyRect)) {
     NSColor* strokeColor = skia::SkColorToCalibratedNSColor(
-        chrome::GetDetachedBookmarkBarSeparatorColor(themeService));
+        chrome::GetDetachedBookmarkBarSeparatorColor(profile));
     strokeColor = [[self strokeColor] blendedColorWithFraction:morph
                                                        ofColor:strokeColor];
     strokeColor = [strokeColor colorWithAlphaComponent:0.5];
     [strokeColor set];
     NSRectFillUsingOperation(NSIntersectionRect(strokeRect, dirtyRect),
                              NSCompositeSourceOver);
   }
 }
 
 @end  // @implementation BookmarkBarToolbarView