Update Windows System Monitor Removable Device Impl.

chrome/browser/system_monitor/media_storage_util.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.
 
 // chrome::MediaStorageUtil implementation.
 
 #include "chrome/browser/system_monitor/media_storage_util.h"
 
 #include <vector>
 
@@ skipping 11 matching lines @@
 namespace {
 
 typedef std::vector<SystemMonitor::RemovableStorageInfo> RemovableStorageInfo;
 
 // Prefix constants for different device id spaces.
 const char kRemovableMassStorageWithDCIMPrefix[] = "dcim:";
 const char kRemovableMassStorageNoDCIMPrefix[] = "nodcim:";
 const char kFixedMassStoragePrefix[] = "path:";
 const char kMtpPtpPrefix[] = "mtp:";
 
-static void (*g_test_get_device_info_from_path_function)(
+static bool (*g_test_get_device_info_from_path_function)(
     const FilePath& path, std::string* device_id, string16* device_name,
     FilePath* relative_path) = NULL;
 
 void ValidatePathOnFileThread(
     const FilePath& path, const MediaStorageUtil::BoolCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback, file_util::PathExists(path)));
 }
 
@@ skipping 96 matching lines @@
   } else {
     DCHECK(type == MTP_OR_PTP ||
            type == REMOVABLE_MASS_STORAGE_WITH_DCIM ||
            type == REMOVABLE_MASS_STORAGE_NO_DCIM);
     // We should be able to find removable storage in SystemMonitor.
     callback.Run(!FindRemovableStorageLocationById(device_id).empty());
   }
 }
 
 // static
-void MediaStorageUtil::GetDeviceInfoFromPath(const FilePath& path,
+bool MediaStorageUtil::GetDeviceInfoFromPath(const FilePath& path,
                                              std::string* device_id,
                                              string16* device_name,
                                              FilePath* relative_path) {
   if (g_test_get_device_info_from_path_function) {
-    g_test_get_device_info_from_path_function(path, device_id, device_name,
-                                              relative_path);
+    return g_test_get_device_info_from_path_function(path, device_id,
+                                                     device_name,
+                                                     relative_path);
   } else {
-    GetDeviceInfoFromPathImpl(path, device_id, device_name, relative_path);
+    return GetDeviceInfoFromPathImpl(path, device_id, device_name,
+                                     relative_path);
   }
 }
 
 // static
 FilePath MediaStorageUtil::FindDevicePathById(const std::string& device_id) {
   Type type;
   std::string unique_id;
   if (!CrackDeviceId(device_id, &type, &unique_id))
     return FilePath();
 
   if (type == FIXED_MASS_STORAGE) {
     // For this type, the unique_id is the path.
     return FilePath::FromUTF8Unsafe(unique_id);
   }
 
   DCHECK(type == MTP_OR_PTP ||
          type == REMOVABLE_MASS_STORAGE_WITH_DCIM ||
          type == REMOVABLE_MASS_STORAGE_NO_DCIM);
   return FilePath(FindRemovableStorageLocationById(device_id));
 }
 
 // static
 void MediaStorageUtil::SetGetDeviceInfoFromPathFunctionForTesting(
     GetDeviceInfoFromPathFunction function) {
   g_test_get_device_info_from_path_function = function;
 }
 
 MediaStorageUtil::MediaStorageUtil() {}
 
-#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if !defined(OS_WIN) || !defined(OS_LINUX) || defined(OS_CHROMEOS)
 // static
-void MediaStorageUtil::GetDeviceInfoFromPathImpl(const FilePath& path,
+bool MediaStorageUtil::GetDeviceInfoFromPathImpl(const FilePath& path,
                                                  std::string* device_id,
                                                  string16* device_name,
                                                  FilePath* relative_path) {
   // TODO(vandebo) This needs to be implemented per platform.  Below is no
   // worse than what the code already does.
   // * Find mount point parent (determines relative file path)
   // * Search System monitor, just in case.
   // * If it's a removable device, generate device id, else use device root
   //   path as id
   if (device_id)
     *device_id = MakeDeviceId(FIXED_MASS_STORAGE, path.AsUTF8Unsafe());
   if (device_name)
     *device_name = path.BaseName().LossyDisplayName();
   if (relative_path)
     *relative_path = FilePath();
+  return true;
 }
 #endif
 
 }  // namespace chrome