Switch from MountLibrary to CrosDisksLibrary

chrome/browser/chromeos/disks/disk_mount_manager.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/browser/chromeos/disks/disk_mount_manager.h"
 
 #include <map>
 #include <set>
 
 #include <sys/statvfs.h>
@@ skipping 310 matching lines @@
     if (iter == disks_.end()) {
       // disk might have been removed by now.
       return;
     }
     Disk* disk = iter->second;
     DCHECK(disk);
     disk->clear_mount_path();
     // Check if there is a formatting scheduled.
     PathMap::iterator it = formatting_pending_.find(disk->device_path());
     if (it != formatting_pending_.end()) {
-      const std::string& file_path = it->second;
+      // Copy the string before it gets erased.
+      const std::string file_path = it->second;
       formatting_pending_.erase(it);
       FormatUnmountedDevice(file_path);
     }
   }
 
   // Callback for FormatDevice.
   void OnFormatDevice(const std::string& device_path, bool success) {
     if (success) {
       NotifyDeviceStatusUpdate(MOUNT_FORMATTING_STARTED, device_path);
     } else {
@@ skipping 283 matching lines @@
   else if (type_str == "network")
     return MOUNT_TYPE_NETWORK_STORAGE;
   else if (type_str == "file")
     return MOUNT_TYPE_ARCHIVE;
   else
     return MOUNT_TYPE_INVALID;
 }
 
 // static
 void DiskMountManager::Initialize() {
-  VLOG(1) << "DiskMountManager::Initialize";
-  DCHECK(!g_disk_mount_manager);
+  if (g_disk_mount_manager) {
+    LOG(WARNING) << "DiskMountManager was already initialized";
+    return;
+  }
   g_disk_mount_manager = new DiskMountManagerImpl();
-  DCHECK(g_disk_mount_manager);
+  VLOG(1) << "DiskMountManager initialized";
+}
+
+// static
+void DiskMountManager::InitializeForTesting(DiskMountManager* disk_mount_manager
+                                            ) {

[satorux1, 2011/11/16 06:46:06]

Hmm, this looks uglier than before.. Please change it back.

[hashimoto, 2011/11/16 07:45:32]

Done.

+  if (g_disk_mount_manager) {
+    LOG(WARNING) << "DiskMountManager was already initialized";
+    return;
+  }
+  g_disk_mount_manager = disk_mount_manager;
+  VLOG(1) << "DiskMountManager initialized";
 }
 
 // static
 void DiskMountManager::Shutdown() {
-  VLOG(1) << "DiskMountManager::Shutdown";
-  if (g_disk_mount_manager) {
-    delete g_disk_mount_manager;
-    g_disk_mount_manager = NULL;
+  if (!g_disk_mount_manager) {
+    LOG(WARNING) << "DiskMountManager::Shutdown() called with NULL manager";
+    return;
   }
+  delete g_disk_mount_manager;
+  g_disk_mount_manager = NULL;
+  VLOG(1) << "DiskMountManager Shutdown completed";
 }
 
 // static
 DiskMountManager* DiskMountManager::GetInstance() {
   return g_disk_mount_manager;
 }
 
 }  // namespace disks
 }  // namespace chromeos