Remove BrowserNonClientView::GetThemeProviderForProfile and just use GetThemeProvider.

Change-Id: I9c458a7fe05c2ed60c1f9498dd0cea3cc3237455
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019923
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735051}

chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

@@ -150,7 +150,7 @@ SkColor BrowserNonClientFrameView::GetFrameColor(
                  : ThemeProperties::COLOR_FRAME_INACTIVE;
 
   if (frame_->ShouldUseTheme())
-    return GetThemeProviderForProfile()->GetColor(color_id);
+    return GetThemeProvider()->GetColor(color_id);
 
   // Use app theme color if it is set, but not for apps with tabs.
   web_app::AppBrowserController* app_controller =
@@ -253,7 +253,7 @@ bool BrowserNonClientFrameView::ShouldPaintAsActive(
 
 gfx::ImageSkia BrowserNonClientFrameView::GetFrameImage(
     BrowserFrameActiveState active_state) const {
-  const ui::ThemeProvider* tp = GetThemeProviderForProfile();
+  const ui::ThemeProvider* tp = GetThemeProvider();
   const int frame_image_id = ShouldPaintAsActive(active_state)
                                  ? IDR_THEME_FRAME
                                  : IDR_THEME_FRAME_INACTIVE;
@@ -268,7 +268,7 @@ gfx::ImageSkia BrowserNonClientFrameView::GetFrameOverlayImage(
   if (browser_view_->IsIncognito() || !browser_view_->IsBrowserTypeNormal())
     return gfx::ImageSkia();
 
-  const ui::ThemeProvider* tp = GetThemeProviderForProfile();
+  const ui::ThemeProvider* tp = GetThemeProvider();
   const int frame_overlay_image_id = ShouldPaintAsActive(active_state)
                                          ? IDR_THEME_FRAME_OVERLAY
                                          : IDR_THEME_FRAME_OVERLAY_INACTIVE;
@@ -387,13 +387,6 @@ int BrowserNonClientFrameView::GetSystemMenuY() const {
 }
 #endif
 
-const ui::ThemeProvider*
-BrowserNonClientFrameView::GetThemeProviderForProfile() const {
-  // Because the frame's accessor reads the ThemeProvider from the profile and
-  // not the widget, it can be called even before we're in a view hierarchy.
-  return frame_->GetThemeProvider();
-}
-
 SkColor BrowserNonClientFrameView::GetThemeOrDefaultColor(int color_id) const {
   if (!frame_->ShouldUseTheme())
     return GetUnthemedColor(color_id);

chrome/browser/ui/views/frame/browser_non_client_frame_view.h

@@ -177,10 +177,6 @@ class BrowserNonClientFrameView : public views::NonClientFrameView,
   int GetSystemMenuY() const override;
 #endif
 
-  // Gets a theme provider that should be non-null even before we're added to a
-  // view hierarchy.
-  const ui::ThemeProvider* GetThemeProviderForProfile() const;
-
   // Returns the color of the given |color_id| from the theme provider or the
   // default theme properties.
   SkColor GetThemeOrDefaultColor(int color_id) const;