Media Galleries: Change the media gallery name to be a JSON value with the name and pref id.

chrome/browser/media_gallery/media_file_system_registry.h

 // 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 registers pictures directories and media devices as
 // File API filesystems and keeps track of the path to filesystem ID mappings.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_
 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_
 
@@ skipping 24 matching lines @@
 class IsolatedContext;
 }
 
 namespace chrome {
 
 class ExtensionGalleriesHost;
 class MediaGalleriesPreferences;
 class ScopedMediaDeviceMapEntry;
 
 struct MediaFileSystemInfo {
-  string16 name;
+  MediaFileSystemInfo(const std::string& fs_name,
+                      const FilePath& fs_path,
+                      const std::string& filesystem_id);
+  MediaFileSystemInfo();
+
+  std::string name;  // JSON string, must not contain slashes.
+  FilePath path;
   std::string fsid;
-  FilePath path;
 };
 
 typedef base::Callback<void(const std::vector<MediaFileSystemInfo>&)>
     MediaFileSystemsCallback;
 
 class MediaFileSystemRegistry
     : public base::SystemMonitor::DevicesChangedObserver {
  public:
   // The instance is lazily created per browser process.
   static MediaFileSystemRegistry* GetInstance();
@@ skipping 67 matching lines @@
   // Only accessed on the UI thread.
   MTPDeviceDelegateMap mtp_delegate_map_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistry);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_