Destroy StorageMonitorCros before DBusServices (take 2)

chrome/browser/media_galleries/media_galleries_preferences.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/media_galleries/media_galleries_preferences.h"
 
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
@@ skipping 244 matching lines @@
       base::Bind(&MediaGalleriesPreferences::OnPicasaDeviceID,
                  weak_factory_.GetWeakPtr()));
 #endif
 
   InitFromPrefs(false /*no notification*/);
 
   StorageMonitor::GetInstance()->AddObserver(this);
 }
 
 MediaGalleriesPreferences::~MediaGalleriesPreferences() {
-  StorageMonitor::GetInstance()->RemoveObserver(this);
+  if (StorageMonitor::GetInstance())

[Greg Billock, 2013/06/13 14:55:31]

This should merge out now since it was in the other change you submitted.

+    StorageMonitor::GetInstance()->RemoveObserver(this);
 }
 
 void MediaGalleriesPreferences::AddDefaultGalleriesIfFreshProfile() {
   // Only add defaults the first time.
   if (APIHasBeenUsed(profile_))
     return;
 
   // Fresh profile case.
   const int kDirectoryKeys[] = {
     DIR_USER_MUSIC,
@@ skipping 550 matching lines @@
     return extension_prefs_for_testing_;
   return extensions::ExtensionPrefs::Get(profile_);
 }
 
 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
     extensions::ExtensionPrefs* extension_prefs) {
   extension_prefs_for_testing_ = extension_prefs;
 }
 
 }  // namespace chrome