Media Galleries: Add more tests for media gallery names.

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 <vector>
@@ skipping 315 matching lines @@
 
     // This should have been a StringValue, but it's a bit late to change it.
     dict_value.SetIntegerWithoutPathExpansion("galleryId", pref_id);
 
     // |device_id| can be empty, in which case, just omit it.
     std::string transient_device_id =
         GetTransientIdForRemovableDeviceId(device_id);
     if (!transient_device_id.empty())
       dict_value.SetStringWithoutPathExpansion("deviceId", transient_device_id);
 
+    dict_value.SetBooleanWithoutPathExpansion(
+        "isRemovable", MediaStorageUtil::IsRemovableDevice(device_id));

[kmadhusu, 2012/12/12 17:45:02]

I am not sure why we need a new key value pair to identify whether the gallery
is removable or not.

Can't we easily find that information with the existing key-values from the json
string? 

If (json string has "deviceId" value)
  Current gallery belongs to removable device

[Lei Zhang, 2012/12/12 20:15:15]

That's a good point. We can discuss this on the bug.

+
     std::string json_string;
     base::JSONWriter::Write(&dict_value, &json_string);
     return json_string;
   }
 
   void OnRendererProcessTerminated(const RenderProcessHost* rph) {
     RenderProcessHostRefCount::const_iterator rph_info = rph_refs_.find(rph);
     DCHECK(rph_info != rph_refs_.end());
     // We're going to remove everything from the set, so we make a copy
     // before operating on it.
@@ skipping 346 matching lines @@
 }
 
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
 ScopedMTPDeviceMapEntry*
 MediaFileSystemRegistry::GetOrCreateScopedMTPDeviceMapEntry(
     const FilePath::StringType& device_location) {
   MTPDeviceDelegateMap::iterator delegate_it =
       mtp_device_delegate_map_.find(device_location);
   if (delegate_it != mtp_device_delegate_map_.end())
     return delegate_it->second;
-  ScopedMTPDeviceMapEntry* mtp_device_host = new ScopedMTPDeviceMapEntry(
-      device_location, base::Bind(
-          &MediaFileSystemRegistry::RemoveScopedMTPDeviceMapEntry,
-          base::Unretained(this), device_location));
+  ScopedMTPDeviceMapEntry* mtp_device_host =
+      new ScopedMTPDeviceMapEntry(
+          device_location,
+          base::Bind(
+              &MediaFileSystemRegistry::RemoveScopedMTPDeviceMapEntry,
+              base::Unretained(this),
+              device_location));
   mtp_device_delegate_map_[device_location] = mtp_device_host;
   return mtp_device_host;
 }
 
 void MediaFileSystemRegistry::RemoveScopedMTPDeviceMapEntry(
     const FilePath::StringType& device_location) {
   MTPDeviceDelegateMap::iterator delegate_it =
       mtp_device_delegate_map_.find(device_location);
   DCHECK(delegate_it != mtp_device_delegate_map_.end());
   mtp_device_delegate_map_.erase(delegate_it);
@@ skipping 15 matching lines @@
 
     PrefChangeRegistrarMap::iterator pref_it =
         pref_change_registrar_map_.find(profile);
     DCHECK(pref_it != pref_change_registrar_map_.end());
     delete pref_it->second;
     pref_change_registrar_map_.erase(pref_it);
   }
 }
 
 }  // namespace chrome