2 files changed, 10 insertions, 7 deletions
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 1b4fd63..1b6cd7b 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -181,6 +181,7 @@ TestingProfile::~TestingProfile() {
   if (extension_service_.get()) {
     extension_service_.reset();
   }
+
   if (pref_proxy_config_tracker_.get())
     pref_proxy_config_tracker_->DetachFromPrefService();
 }
@@ -425,9 +426,9 @@ ExtensionEventRouter* TestingProfile::GetExtensionEventRouter() {
 
 ExtensionSpecialStoragePolicy*
 TestingProfile::GetExtensionSpecialStoragePolicy() {
-  if (!extension_special_storage_policy_)
+  if (!extension_special_storage_policy_.get())
     extension_special_storage_policy_ = new ExtensionSpecialStoragePolicy();
-  return extension_special_storage_policy_;
+  return extension_special_storage_policy_.get();
 }
 
 SSLHostState* TestingProfile::GetSSLHostState() {
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 51306a2..2083bea 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -352,13 +352,17 @@ class TestingProfile : public Profile {
   // Did the last session exit cleanly? Default is true.
   bool last_session_exited_cleanly_;
 
-  // The main database tracker for this profile.
-  // Should be used only on the file thread.
-  scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
+
+  // FileSystemContext.  Created lazily by GetFileSystemContext().
+  scoped_refptr<fileapi::FileSystemContext> file_system_context_;
 
   // WebKitContext, lazily initialized by GetWebKitContext().
   scoped_refptr<WebKitContext> webkit_context_;
 
+  // The main database tracker for this profile.
+  // Should be used only on the file thread.
+  scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
+
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   scoped_refptr<GeolocationContentSettingsMap>
       geolocation_content_settings_map_;
@@ -381,8 +385,6 @@ class TestingProfile : public Profile {
   scoped_refptr<ExtensionSpecialStoragePolicy>
       extension_special_storage_policy_;
 
-  // FileSystemContext.  Created lazily by GetFileSystemContext().
-  scoped_refptr<fileapi::FileSystemContext> file_system_context_;
 
   // The proxy prefs tracker.
   scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;