Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/ui/webui/theme_handler.cc

 // Copyright (c) 2013 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 "chrome/browser/ui/webui/theme_handler.h"
 
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 21 matching lines @@
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(GetProfile())));
 }
 
 void ThemeHandler::Observe(int type,
                            const content::NotificationSource& source,
                            const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_BROWSER_THEME_CHANGED, type);
   InitializeCSSCaches();
-  bool has_custom_bg = ThemeServiceFactory::GetForProfile(GetProfile())
-                           ->HasCustomImage(IDR_THEME_NTP_BACKGROUND);
+  bool has_custom_bg = ThemeService::GetThemeProviderForProfile(GetProfile())
+                           .HasCustomImage(IDR_THEME_NTP_BACKGROUND);
   base::DictionaryValue dictionary;
   dictionary.SetBoolean("hasCustomBackground", has_custom_bg);
   web_ui()->CallJavascriptFunction("ntp.themeChanged", dictionary);
 }
 
 void ThemeHandler::InitializeCSSCaches() {
   Profile* profile = GetProfile();
   ThemeSource* theme = new ThemeSource(profile);
   content::URLDataSource::Add(profile, theme);
 }
 
 Profile* ThemeHandler::GetProfile() const {
   return Profile::FromWebUI(web_ui());
 }