Profiles: Make NTPResourceCache a ProfileKeyedService.

chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 558 matching lines @@
 }
 
 void ProfileImpl::InitRegisteredProtocolHandlers() {
   if (protocol_handler_registry_)
     return;
   protocol_handler_registry_ = new ProtocolHandlerRegistry(this,
       new ProtocolHandlerRegistry::Delegate());
   protocol_handler_registry_->Load();
 }
 
-NTPResourceCache* ProfileImpl::GetNTPResourceCache() {
-  if (!ntp_resource_cache_.get())
-    ntp_resource_cache_.reset(new NTPResourceCache(this));
-  return ntp_resource_cache_.get();
-}
-
 FilePath ProfileImpl::last_selected_directory() {
   return GetPrefs()->GetFilePath(prefs::kSelectFileLastDirectory);
 }
 
 void ProfileImpl::set_last_selected_directory(const FilePath& path) {
   GetPrefs()->SetFilePath(prefs::kSelectFileLastDirectory, path);
 }
 
 ProfileImpl::~ProfileImpl() {
   NotificationService::current()->Notify(
       NotificationType::PROFILE_DESTROYED,
       Source<Profile>(this),
       NotificationService::NoDetails());
 
   StopCreateSessionServiceTimer();
 
+  // Remove pref observers
+  pref_change_registrar_.RemoveAll();
+
   ProfileDependencyManager::GetInstance()->DestroyProfileServices(this);
 
   if (clear_local_state_on_exit_) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         NewRunnableFunction(&BrowsingDataRemover::ClearGearsData, path_));
   }
 
   // DownloadManager is lazily created, so check before accessing it.
   if (download_manager_.get()) {
     // The download manager queries the history system and should be shut down
     // before the history is shut down so it can properly cancel all requests.
     download_manager_->Shutdown();
     download_manager_ = NULL;
   }
 
-  // Remove pref observers
-  pref_change_registrar_.RemoveAll();
-
-  // Delete the NTP resource cache so we can unregister pref observers.

[Elliot Glaysher, 2011/06/29 19:12:00]

This comment is seriously wrong. Pref observers are unregistered *right* above
this.

But for safety, I'm moving RemoveAll() before we broadcast our death to all the
PKS.

[Miranda Callahan, 2011/06/29 19:31:57]

Ha! Nice catch.

-  ntp_resource_cache_.reset();
-
   // The sync service needs to be deleted before the services it calls.
   sync_service_.reset();
 
   // Password store uses WebDB, shut it down before the WebDB has been shutdown.
   if (password_store_.get())
     password_store_->Shutdown();
 
   // Both HistoryService and WebDataService maintain threads for background
   // processing. Its possible each thread still has tasks on it that have
   // increased the ref count of the service. In such a situation, when we
@@ skipping 1009 matching lines @@
   if (!prerender::PrerenderManager::IsPrerenderingPossible())
     return NULL;
   if (!prerender_manager_.get()) {
     CHECK(g_browser_process->prerender_tracker());
     prerender_manager_.reset(
         new prerender::PrerenderManager(
             this, g_browser_process->prerender_tracker()));
   }
   return prerender_manager_.get();
 }