Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/ui/webui/theme_source.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/webui/theme_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 188 matching lines @@
 // ThemeSource, private:
 
 void ThemeSource::SendThemeBitmap(
     const content::URLDataSource::GotDataCallback& callback,
     int resource_id,
     float scale_factor) {
   ui::ScaleFactor resource_scale_factor =
       ui::GetSupportedScaleFactor(scale_factor);
   if (BrowserThemePack::IsPersistentImageID(resource_id)) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
-    ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
-    DCHECK(tp);
+    const ui::ThemeProvider& tp =
+        ThemeService::GetThemeProviderForProfile(profile_);

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

This looks like its always the non-OTR profile. See line 70

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

yes, but GetRawData doesn't change for incognito yet (and maybe never will)

 
     scoped_refptr<base::RefCountedMemory> image_data(
-        tp->GetRawData(resource_id, resource_scale_factor));
+        tp.GetRawData(resource_id, resource_scale_factor));
     callback.Run(image_data.get());
   } else {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     callback.Run(
         rb.LoadDataResourceBytesForScale(resource_id, resource_scale_factor));
   }
 }
 
 void ThemeSource::SendThemeImage(
     const content::URLDataSource::GotDataCallback& callback,
     int resource_id,
     float scale_factor) {
   // If the resource bundle contains the data pack for |scale_factor|, we can
   // safely fallback to SendThemeBitmap().
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (ui::GetScaleForScaleFactor(rb.GetMaxScaleFactor()) >= scale_factor) {
     SendThemeBitmap(callback, resource_id, scale_factor);
     return;
   }
 
   // Otherwise, we should use gfx::ImageSkia to obtain the data. ImageSkia can
   // rescale the bitmap if its backend doesn't contain the representation for
   // the specified scale factor. This is the fallback path in case chrome is
   // shipped without 2x resource pack but needs to use HighDPI display, which
   // can happen in ChromeOS or Linux.
   scoped_refptr<base::RefCountedBytes> data(new base::RefCountedBytes());
   if (BrowserThemePack::IsPersistentImageID(resource_id)) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
-    ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
-    DCHECK(tp);
-
-    ProcessImageOnUIThread(*tp->GetImageSkiaNamed(resource_id), scale_factor,
+    const ui::ThemeProvider& tp =
+        ThemeService::GetThemeProviderForProfile(profile_);
+    ProcessImageOnUIThread(*tp.GetImageSkiaNamed(resource_id), scale_factor,
                            data);
     callback.Run(data.get());
   } else {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     // Fetching image data in ResourceBundle should happen on the UI thread. See
     // crbug.com/449277
     content::BrowserThread::PostTaskAndReply(
         content::BrowserThread::UI, FROM_HERE,
         base::Bind(&ProcessResourceOnUIThread, resource_id, scale_factor, data),
         base::Bind(callback, data));
   }
 }