Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/themes/theme_service_mac.mm

Index: chrome/browser/themes/theme_service_mac.mm
diff --git a/chrome/browser/themes/theme_service_mac.mm b/chrome/browser/themes/theme_service_mac.mm
index 061e5137244ef74ebc20ac74f313d6397978968d..371df94527d1c8705668c2483113e4a86f07374e 100644
--- a/chrome/browser/themes/theme_service_mac.mm
+++ b/chrome/browser/themes/theme_service_mac.mm
@@ -112,7 +112,7 @@ NSColor* ThemeService::GetNSColor(int id) const {
   if (nscolor_iter != nscolor_cache_.end())
     return nscolor_iter->second;
 
-  SkColor sk_color = GetColor(id);
+  SkColor sk_color = GetColor(id, false);
   NSColor* color = skia::SkColorToCalibratedNSColor(sk_color);
 
   // We loaded successfully.  Cache the color.
@@ -286,3 +286,28 @@ void ThemeService::FreePlatformCaches() {
   }
   nsgradient_cache_.clear();
 }
+
+bool ThemeService::BrowserThemeProvider::UsingSystemTheme() const {
+  return theme_service_.UsingSystemTheme();
+}
+
+NSImage* ThemeService::BrowserThemeProvider::GetNSImageNamed(int id) const {
+  return theme_service_.GetNSImageNamed(id);
+}
+
+NSColor* ThemeService::BrowserThemeProvider::GetNSImageColorNamed(
+    int id) const {
+  return theme_service_.GetNSImageColorNamed(id);
+}
+
+NSColor* ThemeService::BrowserThemeProvider::GetNSColor(int id) const {
+  return theme_service_.GetNSColor(id);
+}
+
+NSColor* ThemeService::BrowserThemeProvider::GetNSColorTint(int id) const {
+  return theme_service_.GetNSColorTint(id);
+}
+
+NSGradient* ThemeService::BrowserThemeProvider::GetNSGradient(int id) const {
+  return theme_service_.GetNSGradient(id);
+}