Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/ui/search/search_ui.cc

 // 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.
 
 #include "chrome/browser/ui/search/search_ui.h"
 
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
+#include "chrome/browser/themes/theme_service_factory.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
 
 namespace chrome {
 
-SkColor GetDetachedBookmarkBarBackgroundColor(ThemeService* theme_service) {
-  if (!theme_service->UsingDefaultTheme())
-    return theme_service->GetColor(ThemeProperties::COLOR_TOOLBAR);
+SkColor GetDetachedBookmarkBarBackgroundColor(Profile* profile) {
+  ThemeService* service = ThemeServiceFactory::GetForProfile(profile);
+  const ui::ThemeProvider& provider =
+      ThemeService::GetThemeProviderForProfile(profile);
+  if (!service->UsingDefaultTheme())

[pkotwicz, 2015/12/04 23:16:50]

Nit: You only need to fetch the ThemeProvider if the default theme is not used

[Evan Stade, 2015/12/09 00:57:11]

Done.

+    return provider.GetColor(ThemeProperties::COLOR_TOOLBAR);
 
   return ui::MaterialDesignController::IsModeMaterial()
              ? SK_ColorWHITE
              : SkColorSetARGB(0xFF, 0xF1, 0xF1, 0xF1);
 }
 
-SkColor GetDetachedBookmarkBarSeparatorColor(ThemeService* theme_service) {
-  if (theme_service->UsingDefaultTheme()) {
+SkColor GetDetachedBookmarkBarSeparatorColor(Profile* profile) {
+  ThemeService* service = ThemeServiceFactory::GetForProfile(profile);
+  if (service->UsingDefaultTheme()) {
     return ThemeProperties::GetDefaultColor(
         ThemeProperties::COLOR_TOOLBAR_SEPARATOR);
   }
 
+  const ui::ThemeProvider& provider =
+      ThemeService::GetThemeProviderForProfile(profile);
   // Use 50% of bookmark text color as separator color.
-  return SkColorSetA(
-      theme_service->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT), 128);
+  return SkColorSetA(provider.GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT),
+                     128);
 }
 
 }  // namespace chrome