Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 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/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 1528 matching lines @@
   [rootView cr_recursivelyInvokeBlock:^(id view) {
       if ([view conformsToProtocol:@protocol(ThemedWindowDrawing)])
         [view windowDidChangeTheme];
 
       // TODO(andresantoso): Remove this once all themed views respond to
       // windowDidChangeTheme above.
       [view setNeedsDisplay:YES];
   }];
 }
 
+// TODO(estade): change this function to return a const* or const& and remove
+// this cast.
 - (ui::ThemeProvider*)themeProvider {
-  return ThemeServiceFactory::GetForProfile(browser_->profile());
+  return const_cast<ui::ThemeProvider*>(
+      &ThemeService::GetThemeProviderForProfile(browser_->profile()));
 }
 
 - (ThemedWindowStyle)themedWindowStyle {
   ThemedWindowStyle style = 0;
   if (browser_->profile()->IsOffTheRecord())
     style |= THEMED_INCOGNITO;
 
   if (browser_->is_devtools())
     style |= THEMED_DEVTOOLS;
   if (browser_->is_type_popup())
@@ skipping 537 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)