Destroy StorageMonitorCros before DBusServices (take 2)

chrome/browser/media_galleries/media_galleries_dialog_controller.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_dialog_controller.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 108 matching lines @@
 
   preferences_->AddGalleryChangeObserver(this);
 }
 
 MediaGalleriesDialogController::MediaGalleriesDialogController()
     : web_contents_(NULL),
       extension_(NULL),
       preferences_(NULL) {}
 
 MediaGalleriesDialogController::~MediaGalleriesDialogController() {
-  StorageMonitor::GetInstance()->RemoveObserver(this);
+  if (chrome::StorageMonitor::GetInstance())
+    StorageMonitor::GetInstance()->RemoveObserver(this);
 
   if (select_folder_dialog_.get())
     select_folder_dialog_->ListenerDestroyed();
 }
 
 // static
 string16 MediaGalleriesDialogController::GetGalleryDisplayName(
     const MediaGalleryPrefInfo& gallery) {
   string16 name = gallery.display_name;
   if (IsAttachedDevice(gallery.device_id)) {
@@ skipping 371 matching lines @@
     if (iter->pref_info.device_id == device_id)
       dialog_->UpdateGallery(iter->pref_info, iter->allowed);
   }
 }
 
 // MediaGalleries dialog -------------------------------------------------------
 
 MediaGalleriesDialog::~MediaGalleriesDialog() {}
 
 }  // namespace chrome