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 260 matching lines @@
         DCHECK(mtp_device_host.get());
         media_device_map_references_[pref_id] = mtp_device_host;
 #else
         NOTIMPLEMENTED();
         continue;
 #endif
       }
       DCHECK(!fsid.empty());
 
       MediaFileSystemInfo new_entry(
-          MakeJSONFileSystemName(gallery_info.display_name,
-                                 pref_id,
-                                 device_id),
+          MakeJSONFileSystemName(gallery_info, pref_id, device_id),
           path,
           fsid);
       result.push_back(new_entry);
       new_galleries.insert(pref_id);
       pref_id_map_[pref_id] = new_entry;
     }
 
     if (result.size() == 0) {
       rph_refs_.clear();
       CleanUp();
     } else {
       RevokeOldGalleries(new_galleries);
     }
 
     callback.Run(result);
   }
 
   std::string GetTransientIdForRemovableDeviceId(const std::string& device_id) {
     if (!MediaStorageUtil::IsRemovableDevice(device_id))
       return std::string();
     MediaFileSystemRegistry* registry =
         file_system_context_->GetMediaFileSystemRegistry();
     return registry->GetTransientIdForDeviceId(device_id);
   }
 
-  // Make a JSON string out of |name|, |pref_id| and |device_id|. The IDs makes
-  // the combined name unique. The JSON string should not contain any slashes.
-  std::string MakeJSONFileSystemName(const string16& name,
+  // Make a JSON string out of |gallery_info|, |pref_id| and |device_id|.
+  // The IDs makes the combined name unique.
+  // The JSON string should not contain any slashes.
+  std::string MakeJSONFileSystemName(const MediaGalleryPrefInfo& gallery_info,
                                      const MediaGalleryPrefId& pref_id,
                                      const std::string& device_id) {
     string16 sanitized_name;
     string16 separators =
 #if defined(FILE_PATH_USES_WIN_SEPARATORS)
         FilePath::kSeparators
 #else
         ASCIIToUTF16(FilePath::kSeparators)
 #endif
         ;  // NOLINT
+    const string16& name = gallery_info.display_name;
     ReplaceChars(name, separators.c_str(), ASCIIToUTF16("_"), &sanitized_name);
 
     base::DictionaryValue dict_value;
-    dict_value.SetStringWithoutPathExpansion("name", sanitized_name);
+    dict_value.SetStringWithoutPathExpansion(
+        MediaFileSystemRegistry::kNameKey, sanitized_name);
 
     // This should have been a StringValue, but it's a bit late to change it.
-    dict_value.SetIntegerWithoutPathExpansion("galleryId", pref_id);
+    dict_value.SetIntegerWithoutPathExpansion(
+        MediaFileSystemRegistry::kGalleryIdKey, 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);
+    if (!transient_device_id.empty()) {
+      dict_value.SetStringWithoutPathExpansion(
+          MediaFileSystemRegistry::kDeviceIdKey, transient_device_id);
+    }
+
+    DCHECK(gallery_info.type == MediaGalleryPrefInfo::kAutoDetected ||
+           gallery_info.type == MediaGalleryPrefInfo::kUserAdded);
+    dict_value.SetBooleanWithoutPathExpansion(
+        MediaFileSystemRegistry::kUserAddedKey,
+        gallery_info.type == MediaGalleryPrefInfo::kUserAdded);
 
     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
@@ skipping 71 matching lines @@
   // A registrar for listening notifications.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionGalleriesHost);
 };
 
 /******************
  * Public methods
  ******************/
 
+const char MediaFileSystemRegistry::kDeviceIdKey[] = "deviceId";
+const char MediaFileSystemRegistry::kGalleryIdKey[] = "galleryId";
+const char MediaFileSystemRegistry::kNameKey[] = "name";
+const char MediaFileSystemRegistry::kUserAddedKey[] = "userAdded";
+
 void MediaFileSystemRegistry::GetMediaFileSystemsForExtension(
     const content::RenderViewHost* rvh,
     const extensions::Extension* extension,
     const MediaFileSystemsCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   Profile* profile =
       Profile::FromBrowserContext(rvh->GetProcess()->GetBrowserContext());
   MediaGalleriesPreferences* preferences = GetPreferences(profile);
   MediaGalleryPrefIdSet galleries =
@@ skipping 255 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