Profiles: Make NTPResourceCache a ProfileKeyedService.

chrome/browser/ui/webui/theme_source.cc

 // Copyright (c) 2011 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.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/resources_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
+#include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 
 // use a resource map rather than hard-coded strings.
 static const char* kNewTabCSSPath = "css/newtab.css";
 static const char* kNewIncognitoTabCSSPath = "css/newincognitotab.css";
 
 static std::string StripQueryParams(const std::string& path) {
   GURL path_url = GURL(std::string(chrome::kChromeUIScheme) + "://" +
                        std::string(chrome::kChromeUIThemePath) + "/" + path);
   return path_url.path().substr(1);  // path() always includes a leading '/'.
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ThemeSource, public:
 
 ThemeSource::ThemeSource(Profile* profile)
     : DataSource(chrome::kChromeUIThemePath, MessageLoop::current()),
       profile_(profile->GetOriginalProfile()) {
-  css_bytes_ = profile_->GetNTPResourceCache()->GetNewTabCSS(
+  css_bytes_ = NTPResourceCacheFactory::GetForProfile(profile)->GetNewTabCSS(
       profile->IsOffTheRecord());
 }
 
 ThemeSource::~ThemeSource() {
 }
 
 void ThemeSource::StartDataRequest(const std::string& path,
                                    bool is_incognito,
                                    int request_id) {
   // Our path may include cachebuster arguments, so trim them off.
@@ skipping 64 matching lines @@
     DCHECK(tp);
 
     scoped_refptr<RefCountedMemory> image_data(tp->GetRawData(resource_id));
     SendResponse(request_id, image_data);
   } else {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     SendResponse(request_id, rb.LoadDataResourceBytes(resource_id));
   }
 }