Modify ProfileDestroyer to prevent leaks.

chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 41 matching lines @@
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/chrome_version_service.h"
 #include "chrome/browser/profiles/gaia_info_update_service.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
+#include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/browser/user_style_sheet_watcher.h"
 #include "chrome/browser/visitedlink/visitedlink_event_listener.h"
@@ skipping 422 matching lines @@
 
   ChromePluginServiceFilter::GetInstance()->UnregisterResourceContext(
       io_data_.GetResourceContextNoInit());
 
   if (io_data_.HasMainRequestContext() &&
       default_request_context_ == GetRequestContext()) {
     default_request_context_ = NULL;
   }
 
   // Destroy OTR profile and its profile services first.
-  DestroyOffTheRecordProfile();
+  if (off_the_record_profile_.get()) {
+    ProfileDestroyer::DestroyOffTheRecordProfileNow(
+        off_the_record_profile_.get());
+  } else {
+    ExtensionPrefValueMapFactory::GetForProfile(this)->
+        ClearAllIncognitoSessionOnlyPreferences();
+  }
 
   ProfileDependencyManager::GetInstance()->DestroyProfileServices(this);
 
   // The HistoryService maintains 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 decrement the refcount,
   // it won't be 0, and the threads/databases aren't properly shut down. By
   // explicitly calling Cleanup/Shutdown we ensure the databases are properly
   // closed.
 
@@ skipping 579 matching lines @@
   if (!path.empty())
     *cache_path = path;
   *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
                                  prefs_->GetInteger(prefs::kDiskCacheSize);
 }
 
 base::Callback<ChromeURLDataManagerBackend*(void)>
     ProfileImpl::GetChromeURLDataManagerBackendGetter() const {
   return io_data_.GetChromeURLDataManagerBackendGetter();
 }