Create a ProfileDependencyManager to order ProfileKeyedService destruction.

chrome/test/testing_profile.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/test/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/browser/prerender/prerender_manager.h"
+#include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/ntp_resource_cache.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/url_constants.h"
@@ skipping 95 matching lines @@
  private:
   scoped_refptr<net::URLRequestContext> context_;
 };
 
 }  // namespace
 
 TestingProfile::TestingProfile()
     : start_time_(Time::Now()),
       testing_prefs_(NULL),
       incognito_(false),
-      last_session_exited_cleanly_(true) {
+      last_session_exited_cleanly_(true),
+      profile_dependency_manager_(ProfileDependencyManager::GetInstance()) {
   if (!temp_dir_.CreateUniqueTempDir()) {
     LOG(ERROR) << "Failed to create unique temporary directory.";
 
     // Fallback logic in case we fail to create unique temporary directory.
     FilePath system_tmp_dir;
     bool success = PathService::Get(base::DIR_TEMP, &system_tmp_dir);
 
     // We're severly screwed if we can't get the system temporary
     // directory. Die now to avoid writing to the filesystem root
     // or other bad places.
     CHECK(success);
 
     FilePath fallback_dir(system_tmp_dir.AppendASCII("TestingProfilePath"));
     file_util::Delete(fallback_dir, true);
     file_util::CreateDirectory(fallback_dir);
     if (!temp_dir_.Set(fallback_dir)) {
       // That shouldn't happen, but if it does, try to recover.
       LOG(ERROR) << "Failed to use a fallback temporary directory.";
 
       // We're screwed if this fails, see CHECK above.
       CHECK(temp_dir_.Set(system_tmp_dir));
     }
   }
 }
 
 TestingProfile::~TestingProfile() {
   NotificationService::current()->Notify(
       NotificationType::PROFILE_DESTROYED,
-      Source<Profile>(this),
+      Source<Profile>(static_cast<Profile*>(this)),
       NotificationService::NoDetails());
+
+  profile_dependency_manager_->DestroyProfileServices(this);
+
   DestroyTopSites();
   DestroyHistoryService();
   // FaviconService depends on HistoryServce so destroying it later.
   DestroyFaviconService();
   DestroyWebDataService();
   if (extensions_service_.get()) {
     extensions_service_->DestroyingProfile();
     extensions_service_ = NULL;
   }
   if (pref_proxy_config_tracker_.get())
@@ skipping 160 matching lines @@
   return temp_dir_.path();
 }
 
 TestingPrefService* TestingProfile::GetTestingPrefService() {
   if (!prefs_.get())
     CreateTestingPrefService();
   DCHECK(testing_prefs_);
   return testing_prefs_;
 }
 
+void TestingProfile::SetProfileDependencyManager(
+    ProfileDependencyManager* manager) {
+  profile_dependency_manager_ = manager;
+}
+
 ProfileId TestingProfile::GetRuntimeId() {
     return reinterpret_cast<ProfileId>(this);
   }
 
 bool TestingProfile::IsOffTheRecord() {
   return incognito_;
 }
 
 void TestingProfile::SetOffTheRecordProfile(Profile* profile) {
   incognito_profile_.reset(profile);
@@ skipping 419 matching lines @@
 }
 
 DerivedTestingProfile::DerivedTestingProfile(Profile* profile)
     : original_profile_(profile) {}
 
 DerivedTestingProfile::~DerivedTestingProfile() {}
 
 ProfileId DerivedTestingProfile::GetRuntimeId() {
   return original_profile_->GetRuntimeId();
 }