Change base::SystemMonitor's media device functions to take a type and string16 instead of a FilePa…

chrome/browser/media_gallery/media_file_system_registry.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.
 
 // MediaFileSystemRegistry implementation.
 
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
 
 #include <set>
 
 #include "base/path_service.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "webkit/fileapi/isolated_context.h"
 
 namespace chrome {
 
 static base::LazyInstance<MediaFileSystemRegistry>::Leaky
@@ skipping 31 matching lines @@
       std::string fsid = RegisterPathAsFileSystem(pictures_path);
       child_it->second.insert(std::make_pair(pictures_path, fsid));
     }
   }
 
   // TODO(thestig) Handle overlap between devices and media directories.
   SystemMonitor* monitor = SystemMonitor::Get();
   const std::vector<SystemMonitor::MediaDeviceInfo> media_devices =
       monitor->GetAttachedMediaDevices();
   for (size_t i = 0; i < media_devices.size(); ++i) {
-    const SystemMonitor::DeviceIdType& id = media_devices[i].a;
-    const FilePath& path = media_devices[i].c;
-    device_id_map_.insert(std::make_pair(id, path));
-    std::string fsid = RegisterPathAsFileSystem(path);
-    child_it->second.insert(std::make_pair(path, fsid));
+    if (media_devices[i].c == SystemMonitor::TYPE_PATH) {
+      const SystemMonitor::DeviceIdType& id = media_devices[i].a;
+      const FilePath path(
+#if defined(OS_WIN)

[vandebo (ex-Chrome), 2012/07/19 19:05:20]

ugg... Anyway to kill the ifdef here?

[Lei Zhang, 2012/07/19 21:17:10]

If we make location FilePath::StringType instead of always string16. On POSIX,
we probably don't care and will just end up making lots of UTF8ToUTF16
conversions. Let's do that instead? WDYT?

+          media_devices[i].d
+#else
+          UTF16ToUTF8(media_devices[i].d)
+#endif
+          );
+      device_id_map_.insert(std::make_pair(id, path));
+      std::string fsid = RegisterPathAsFileSystem(path);
+      child_it->second.insert(std::make_pair(path, fsid));
+    }
   }
 
   MediaPathToFSIDMap& child_map = child_it->second;
   for (MediaPathToFSIDMap::const_iterator it = child_map.begin();
        it != child_map.end();
        ++it) {
     const FilePath path = it->first;
     const std::string fsid = it->second;
     results.push_back(std::make_pair(fsid, path));
   }
@@ skipping 83 matching lines @@
     MediaPathToFSIDMap& child_map = child_it->second;
     MediaPathToFSIDMap::iterator media_path_it = child_map.find(path);
     if (media_path_it == child_map.end())
       continue;
     isolated_context->RevokeFileSystem(media_path_it->second);
     child_map.erase(media_path_it);
   }
 }
 
 }  // namespace chrome