Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/ui/views/toolbar/toolbar_button.cc

Index: chrome/browser/ui/views/toolbar/toolbar_button.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc
index 03bf129c996ce1377060ae586997e0aaa88a0389..0d376d3d6775f78ba6e3a3a43cfde3c8c7c5e37f 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -8,6 +8,9 @@
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/themes/theme_service.h"
+#include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/views/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "ui/accessibility/ax_view_state.h"
@@ -26,9 +29,11 @@
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/widget.h"
 
-ToolbarButton::ToolbarButton(views::ButtonListener* listener,
+ToolbarButton::ToolbarButton(Profile* profile,
+                             views::ButtonListener* listener,
                              ui::MenuModel* model)
     : views::LabelButton(listener, base::string16()),
+      profile_(profile),
       model_(model),
       menu_showing_(false),
       y_position_on_lbuttondown_(0),
@@ -201,8 +206,9 @@ ToolbarButton::CreateDefaultBorder() const {
   scoped_ptr<views::LabelButtonBorder> border =
       views::LabelButton::CreateDefaultBorder();
 
-  const ui::ThemeProvider* provider = GetThemeProvider();
-  if (provider && provider->UsingSystemTheme())
+  const ThemeService* theme_service =
+      ThemeServiceFactory::GetForProfile(profile_);

[Peter Kasting, 2015/12/09 01:31:59]

Nit: Can just inline into next line

[Evan Stade, 2015/12/09 01:57:06]

Done.

+  if (theme_service->UsingSystemTheme())
     border->set_insets(GetLayoutInsets(TOOLBAR_BUTTON));
 
   return border.Pass();