Convert the BrowerThemeProvider pointer from being ref counted to

chrome/browser/profile.cc

 // Copyright (c) 2006-2008 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/profile.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 518 matching lines @@
   ChromeURLRequestContext* request_context_;
 
   ChromeURLRequestContext* extensions_request_context_;
 
   // Use a seperate appcache service for OTR.
   ChromeAppCacheService* appcache_service_;
 
   // The download manager that only stores downloaded items in memory.
   scoped_refptr<DownloadManager> download_manager_;
 
-  scoped_refptr<BrowserThemeProvider> theme_provider_;
-
   // Use a special WebKit context for OTR browsing.
   scoped_refptr<WebKitContext> webkit_context_;
 
   // We don't want SSLHostState from the OTR profile to leak back to the main
   // profile because then the main profile would learn some of the host names
   // the user visited while OTR.
   scoped_ptr<SSLHostState> ssl_host_state_;
 
   // The StrictTransportSecurityState that only stores enabled sites in memory.
   scoped_refptr<net::StrictTransportSecurityState>
@@ skipping 167 matching lines @@
   // TemplateURLModel schedules a task on the WebDataService from its
   // destructor. Delete it first to ensure the task gets scheduled before we
   // shut down the database.
   template_url_model_.reset();
 
   // The download manager queries the history system and should be deleted
   // before the history is shutdown so it can properly cancel all requests.
   download_manager_ = NULL;
 
   // The theme provider provides bitmaps to whoever wants them.
-  theme_provider_ = NULL;
+  theme_provider_.reset();
 
   // The ThumbnailStore saves thumbnails used by the NTP.  Call Shutdown to
   // save any new thumbnails to disk and release its reference to the
   // HistoryService.
   if (thumbnail_store_.get())
     thumbnail_store_->Shutdown();
 
   // Remove pref observers.
   PrefService* prefs = GetPrefs();
   prefs->RemovePrefObserver(prefs::kSpellCheckDictionary, this);
@@ skipping 366 matching lines @@
   return download_manager_.get();
 }
 
 bool ProfileImpl::HasCreatedDownloadManager() const {
   return created_download_manager_;
 }
 
 void ProfileImpl::InitThemes() {
   if (!created_theme_provider_) {
 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
-    scoped_refptr<BrowserThemeProvider> themes(new GtkThemeProvider);
+    theme_provider_.reset(new GtkThemeProvider);
 #else
-    scoped_refptr<BrowserThemeProvider> themes(new BrowserThemeProvider);
+    theme_provider_.reset(new BrowserThemeProvider);
 #endif
-    themes->Init(this);
+    theme_provider_->Init(this);
     created_theme_provider_ = true;
-    theme_provider_.swap(themes);
   }
 }
 
 void ProfileImpl::SetTheme(Extension* extension) {
   InitThemes();
   theme_provider_.get()->SetTheme(extension);
 }
 
 void ProfileImpl::SetNativeTheme() {
   InitThemes();
@@ skipping 247 matching lines @@
 #endif
   return NULL;
 }
 
 void ProfileImpl::InitSyncService() {
 #ifdef CHROME_PERSONALIZATION
   sync_service_.reset(new ProfileSyncService(this));
   sync_service_->Initialize();
 #endif
 }