[StorageMonitor] Move gallery name generation to StorageInfo.

chrome/browser/media_galleries/media_galleries_preferences_unittest.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.
 
 // MediaGalleriesPreferences unit tests.
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
@@ skipping 276 matching lines @@
         false, 0, 0, 0, 2);
   }
 
   MediaGalleryPrefId AddFixedGalleryWithExepectation(
       const std::string& path_name, const std::string& name,
       MediaGalleryPrefInfo::Type type) {
     base::FilePath path = MakeMediaGalleriesTestingPath(path_name);
     StorageInfo info;
     base::FilePath relative_path;
     MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-    info.set_name(ASCIIToUTF16(name));
-    MediaGalleryPrefId id = AddGalleryWithNameV2(info.device_id(), info.name(),
+    base::string16 gallery_name = base::ASCIIToUTF16(name);
+    MediaGalleryPrefId id = AddGalleryWithNameV2(info.device_id(), gallery_name,
                                                 relative_path, type);
-    AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+    AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                           type);
     Verify();
     return id;
   }
 
   bool UpdateDeviceIDForSingletonType(const std::string& device_id) {
     return gallery_prefs()->UpdateDeviceIDForSingletonType(device_id);
   }
 
   scoped_refptr<extensions::Extension> all_permission_extension;
@@ skipping 31 matching lines @@
 TEST_F(MediaGalleriesPreferencesTest, GalleryManagement) {
   MediaGalleryPrefId auto_id, user_added_id, scan_id, id;
   base::FilePath path;
   base::FilePath relative_path;
   Verify();
 
   // Add a new auto detected gallery.
   path = MakeMediaGalleriesTestingPath("new_auto");
   StorageInfo info;
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewAutoGallery"));
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kAutoDetected);
+  base::string16 gallery_name = base::ASCIIToUTF16("NewAutoGallery");
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kAutoDetected);
   EXPECT_EQ(default_galleries_count() + 1UL, id);
   auto_id = id;
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kAutoDetected);
   Verify();
 
   // Add it as other types, nothing should happen.
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kUserAdded);
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kUserAdded);
   EXPECT_EQ(auto_id, id);
   Verify();
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kAutoDetected);
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kAutoDetected);
   EXPECT_EQ(auto_id, id);
   Verify();
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kScanResult);
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kScanResult);
   EXPECT_EQ(auto_id, id);
 
   // Add a new user added gallery.
   path = MakeMediaGalleriesTestingPath("new_user");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewUserGallery"));
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kUserAdded);
+  gallery_name = base::ASCIIToUTF16("NewUserGallery");
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kUserAdded);
   EXPECT_EQ(default_galleries_count() + 2UL, id);
   user_added_id = id;
   const std::string user_added_device_id = info.device_id();
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kUserAdded);
   Verify();
 
   // Add it as other types, nothing should happen.
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kUserAdded);
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kUserAdded);
   EXPECT_EQ(user_added_id, id);
   Verify();
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kAutoDetected);
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kAutoDetected);
   EXPECT_EQ(user_added_id, id);
   Verify();
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kScanResult);
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kScanResult);
   EXPECT_EQ(user_added_id, id);
   Verify();
 
   // Add a new scan result gallery.
   path = MakeMediaGalleriesTestingPath("new_scan");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewScanGallery"));
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kScanResult);
+  gallery_name = base::ASCIIToUTF16("NewScanGallery");
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kScanResult);
   EXPECT_EQ(default_galleries_count() + 3UL, id);
   scan_id = id;
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kScanResult);
   Verify();
 
   // Add it as other types, nothing should happen.
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kUserAdded);
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kUserAdded);
   EXPECT_EQ(scan_id, id);
   Verify();
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kAutoDetected);
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kAutoDetected);
   EXPECT_EQ(scan_id, id);
   Verify();
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kScanResult);
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kScanResult);
   EXPECT_EQ(scan_id, id);
   Verify();
 
   // Lookup some galleries.
   EXPECT_TRUE(gallery_prefs()->LookUpGalleryByPath(
       MakeMediaGalleriesTestingPath("new_auto"), NULL));
   EXPECT_TRUE(gallery_prefs()->LookUpGalleryByPath(
       MakeMediaGalleriesTestingPath("new_user"), NULL));
   EXPECT_TRUE(gallery_prefs()->LookUpGalleryByPath(
       MakeMediaGalleriesTestingPath("new_scan"), NULL));
@@ skipping 162 matching lines @@
   MediaGalleryPrefId id, metadata_id;
   base::FilePath path;
   StorageInfo info;
   base::FilePath relative_path;
   base::Time now = base::Time::Now();
   Verify();
 
   // Add an auto detected gallery in the prefs version 0 format.
   path = MakeMediaGalleriesTestingPath("new_auto");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewAutoGallery"));
-  id = AddGalleryWithNameV0(info.device_id(), info.name(),
-                            relative_path, false /*auto*/);
+  base::string16 gallery_name = base::ASCIIToUTF16("NewAutoGallery");
+  id = AddGalleryWithNameV0(info.device_id(), gallery_name, relative_path,
+                            false /*auto*/);
   EXPECT_EQ(default_galleries_count() + 1UL, id);
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kAutoDetected);
   Verify();
 
   metadata_id = gallery_prefs()->AddGallery(info.device_id(),
                                             relative_path,
                                             MediaGalleryPrefInfo::kAutoDetected,
                                             ASCIIToUTF16("volume label"),
                                             ASCIIToUTF16("vendor name"),
                                             ASCIIToUTF16("model name"),
                                             1000000ULL, now, 0, 0, 0);
@@ skipping 12 matching lines @@
 TEST_F(MediaGalleriesPreferencesTest, AutoAddedBlackListing) {
   MediaGalleryPrefId auto_id, id;
   base::FilePath path;
   StorageInfo info;
   base::FilePath relative_path;
   Verify();
 
   // Add a new auto detect gallery to test with.
   path = MakeMediaGalleriesTestingPath("new_auto");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewAutoGallery"));
-  id = AddGalleryWithNameV1(info.device_id(), info.name(),
+  base::string16 gallery_name = base::ASCIIToUTF16("NewAutoGallery");
+  id = AddGalleryWithNameV1(info.device_id(), gallery_name,
                             relative_path, false /*auto*/);
   EXPECT_EQ(default_galleries_count() + 1UL, id);
   auto_id = id;
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kAutoDetected);
   Verify();
 
   // Remove an auto added gallery (i.e. make it blacklisted).
   gallery_prefs()->ForgetGalleryById(auto_id);
   expected_galleries_[auto_id].type = MediaGalleryPrefInfo::kBlackListed;
   expected_galleries_for_all.erase(auto_id);
   Verify();
 
   // Try adding the gallery again automatically and it should be a no-op.
-  id = AddGalleryWithNameV1(info.device_id(), info.name(),
-                            relative_path, false /*auto*/);
+  id = AddGalleryWithNameV1(info.device_id(), gallery_name, relative_path,
+                            false /*auto*/);
   EXPECT_EQ(auto_id, id);
   Verify();
 
   // Add the gallery again as a user action.
   id = gallery_prefs()->AddGalleryByPath(path,
                                          MediaGalleryPrefInfo::kUserAdded);
   EXPECT_EQ(auto_id, id);
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kAutoDetected);
   Verify();
 }
 
 // Whenever a "ScanResult" gallery is removed, it is moved to a black listed
 // state.  When the gallery is added again, the black listed state is updated
 // back to the "ScanResult" type.
 TEST_F(MediaGalleriesPreferencesTest, ScanResultBlackListing) {
   MediaGalleryPrefId scan_id, id;
   base::FilePath path;
   StorageInfo info;
   base::FilePath relative_path;
   Verify();
 
   // Add a new scan result gallery to test with.
   path = MakeMediaGalleriesTestingPath("new_scan");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewScanGallery"));
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kScanResult);
+  base::string16 gallery_name = base::ASCIIToUTF16("NewScanGallery");
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kScanResult);
   EXPECT_EQ(default_galleries_count() + 1UL, id);
   scan_id = id;
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kScanResult);
   Verify();
 
   // Remove a scan result gallery (i.e. make it blacklisted).
   gallery_prefs()->ForgetGalleryById(scan_id);
   expected_galleries_[scan_id].type = MediaGalleryPrefInfo::kRemovedScan;
   expected_galleries_for_all.erase(scan_id);
   Verify();
 
   // Try adding the gallery again as a scan result it should be a no-op.
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kScanResult);
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kScanResult);
   EXPECT_EQ(scan_id, id);
   Verify();
 
   // Add the gallery again as a user action.
   id = gallery_prefs()->AddGalleryByPath(path,
                                          MediaGalleryPrefInfo::kUserAdded);
   EXPECT_EQ(scan_id, id);
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kUserAdded);
   Verify();
 }
 
 TEST_F(MediaGalleriesPreferencesTest, UpdateGalleryNameV2) {
   // Add a new auto detect gallery to test with.
   base::FilePath path = MakeMediaGalleriesTestingPath("new_auto");
   StorageInfo info;
   base::FilePath relative_path;
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewAutoGallery"));
+  base::string16 gallery_name = base::ASCIIToUTF16("NewAutoGallery");
   MediaGalleryPrefId id =
-      AddGalleryWithNameV2(info.device_id(), info.name(),
-                           relative_path, MediaGalleryPrefInfo::kAutoDetected);
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+      AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                           MediaGalleryPrefInfo::kAutoDetected);
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kAutoDetected);
   Verify();
 
   // Won't override the name -- don't change any expectation.
-  info.set_name(base::string16());
-  AddGalleryWithNameV2(info.device_id(), info.name(), relative_path,
+  gallery_name = base::string16();
+  AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
                        MediaGalleryPrefInfo::kAutoDetected);
   Verify();
 
-  info.set_name(ASCIIToUTF16("NewName"));
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kAutoDetected);
+  gallery_name = base::ASCIIToUTF16("NewName");
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kAutoDetected);
   // Note: will really just update the existing expectation.
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kAutoDetected);
   Verify();
 }
 
 TEST_F(MediaGalleriesPreferencesTest, GalleryPermissions) {
   MediaGalleryPrefId auto_id, user_added_id, to_blacklist_id, scan_id,
                      to_scan_remove_id, id;
   base::FilePath path;
   StorageInfo info;
   base::FilePath relative_path;
   Verify();
 
   // Add some galleries to test with.
   path = MakeMediaGalleriesTestingPath("new_user");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewUserGallery"));
-  id = AddGalleryWithNameV1(info.device_id(), info.name(),
-                            relative_path, true /*user*/);
+  base::string16 gallery_name = base::ASCIIToUTF16("NewUserGallery");
+  id = AddGalleryWithNameV1(info.device_id(), gallery_name, relative_path,
+                            true /*user*/);
   EXPECT_EQ(default_galleries_count() + 1UL, id);
   user_added_id = id;
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kUserAdded);
   Verify();
 
   path = MakeMediaGalleriesTestingPath("new_auto");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewAutoGallery"));
-  id = AddGalleryWithNameV1(info.device_id(), info.name(),
-                            relative_path, false /*auto*/);
+  gallery_name = base::ASCIIToUTF16("NewAutoGallery");
+  id = AddGalleryWithNameV1(info.device_id(), gallery_name, relative_path,
+                            false /*auto*/);
   EXPECT_EQ(default_galleries_count() + 2UL, id);
   auto_id = id;
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kAutoDetected);
   Verify();
 
   path = MakeMediaGalleriesTestingPath("to_blacklist");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("ToBlacklistGallery"));
-  id = AddGalleryWithNameV1(info.device_id(), info.name(),
-                            relative_path, false /*auto*/);
+  gallery_name = base::ASCIIToUTF16("ToBlacklistGallery");
+  id = AddGalleryWithNameV1(info.device_id(), gallery_name, relative_path,
+                            false /*auto*/);
   EXPECT_EQ(default_galleries_count() + 3UL, id);
   to_blacklist_id = id;
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kAutoDetected);
   Verify();
 
   path = MakeMediaGalleriesTestingPath("new_scan");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewScanGallery"));
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kScanResult);
+  gallery_name = base::ASCIIToUTF16("NewScanGallery");
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kScanResult);
   EXPECT_EQ(default_galleries_count() + 4UL, id);
   scan_id = id;
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kScanResult);
   Verify();
 
   path = MakeMediaGalleriesTestingPath("to_scan_remove");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("ToScanRemoveGallery"));
-  id = AddGalleryWithNameV2(info.device_id(), info.name(),
-                            relative_path, MediaGalleryPrefInfo::kScanResult);
+  gallery_name = base::ASCIIToUTF16("ToScanRemoveGallery");
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
+                            MediaGalleryPrefInfo::kScanResult);
   EXPECT_EQ(default_galleries_count() + 5UL, id);
   to_scan_remove_id = id;
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kScanResult);
   Verify();
 
   // Remove permission for all galleries from the all-permission extension.
   gallery_prefs()->SetGalleryPermissionForExtension(
       *all_permission_extension.get(), auto_id, false);
   expected_galleries_for_all.erase(auto_id);
   Verify();
 
   gallery_prefs()->SetGalleryPermissionForExtension(
@@ skipping 110 matching lines @@
 TEST_F(MediaGalleriesPreferencesTest, UpdateGalleryDetails) {
   MediaGalleryPrefId auto_id, id;
   base::FilePath path;
   StorageInfo info;
   base::FilePath relative_path;
   Verify();
 
   // Add a new auto detect gallery to test with.
   path = MakeMediaGalleriesTestingPath("new_auto");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewAutoGallery"));
-  id = AddGalleryWithNameV1(info.device_id(), info.name(),
+  base::string16 gallery_name = base::ASCIIToUTF16("NewAutoGallery");
+  id = AddGalleryWithNameV1(info.device_id(), gallery_name,
                             relative_path, false /*auto*/);
   EXPECT_EQ(default_galleries_count() + 1UL, id);
   auto_id = id;
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kAutoDetected);
   Verify();
 
   // Update the device name and add the gallery again.
-  info.set_name(ASCIIToUTF16("AutoGallery2"));
-  id = AddGalleryWithNameV1(info.device_id(), info.name(),
-                            relative_path, false /*auto*/);
+  gallery_name = base::ASCIIToUTF16("AutoGallery2");
+  id = AddGalleryWithNameV1(info.device_id(), gallery_name, relative_path,
+                            false /*auto*/);
   EXPECT_EQ(auto_id, id);
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kAutoDetected);
   Verify();
 }
 
 TEST_F(MediaGalleriesPreferencesTest, MultipleGalleriesPerDevices) {
   base::FilePath path;
   StorageInfo info;
   base::FilePath relative_path;
   Verify();
 
   // Add a regular gallery
   path = MakeMediaGalleriesTestingPath("new_user");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewUserGallery"));
+  base::string16 gallery_name = base::ASCIIToUTF16("NewUserGallery");
   MediaGalleryPrefId user_added_id =
-      AddGalleryWithNameV1(info.device_id(), info.name(),
-                           relative_path, true /*user*/);
+      AddGalleryWithNameV1(info.device_id(), gallery_name, relative_path,
+                           true /*user*/);
   EXPECT_EQ(default_galleries_count() + 1UL, user_added_id);
-  AddGalleryExpectation(user_added_id, info.name(), info.device_id(),
+  AddGalleryExpectation(user_added_id, gallery_name, info.device_id(),
                         relative_path, MediaGalleryPrefInfo::kUserAdded);
   Verify();
 
   // Find it by device id and fail to find something related.
   MediaGalleryPrefIdSet pref_id_set;
   pref_id_set = gallery_prefs()->LookUpGalleriesByDeviceId(info.device_id());
   EXPECT_EQ(1U, pref_id_set.size());
   EXPECT_TRUE(pref_id_set.find(user_added_id) != pref_id_set.end());
 
   MediaStorageUtil::GetDeviceInfoFromPath(
       MakeMediaGalleriesTestingPath("new_user/foo"), &info, &relative_path);
   pref_id_set = gallery_prefs()->LookUpGalleriesByDeviceId(info.device_id());
   EXPECT_EQ(0U, pref_id_set.size());
 
   // Add some galleries on the same device.
   relative_path = base::FilePath(FILE_PATH_LITERAL("path1/on/device1"));
-  info.set_name(ASCIIToUTF16("Device1Path1"));
+  gallery_name = base::ASCIIToUTF16("Device1Path1");
   std::string device_id = "path:device1";
   MediaGalleryPrefId dev1_path1_id = AddGalleryWithNameV1(
-      device_id, info.name(), relative_path, true /*user*/);
+      device_id, gallery_name, relative_path, true /*user*/);
   EXPECT_EQ(default_galleries_count() + 2UL, dev1_path1_id);
-  AddGalleryExpectation(dev1_path1_id, info.name(), device_id, relative_path,
+  AddGalleryExpectation(dev1_path1_id, gallery_name, device_id, relative_path,
                         MediaGalleryPrefInfo::kUserAdded);
   Verify();
 
   relative_path = base::FilePath(FILE_PATH_LITERAL("path2/on/device1"));
-  info.set_name(ASCIIToUTF16("Device1Path2"));
+  gallery_name = base::ASCIIToUTF16("Device1Path2");
   MediaGalleryPrefId dev1_path2_id = AddGalleryWithNameV1(
-      device_id, info.name(), relative_path, true /*user*/);
+      device_id, gallery_name, relative_path, true /*user*/);
   EXPECT_EQ(default_galleries_count() + 3UL, dev1_path2_id);
-  AddGalleryExpectation(dev1_path2_id, info.name(), device_id, relative_path,
+  AddGalleryExpectation(dev1_path2_id, gallery_name, device_id, relative_path,
                         MediaGalleryPrefInfo::kUserAdded);
   Verify();
 
   relative_path = base::FilePath(FILE_PATH_LITERAL("path1/on/device2"));
-  info.set_name(ASCIIToUTF16("Device2Path1"));
+  gallery_name = base::ASCIIToUTF16("Device2Path1");
   device_id = "path:device2";
   MediaGalleryPrefId dev2_path1_id = AddGalleryWithNameV1(
-      device_id, info.name(), relative_path, true /*user*/);
+      device_id, gallery_name, relative_path, true /*user*/);
   EXPECT_EQ(default_galleries_count() + 4UL, dev2_path1_id);
-  AddGalleryExpectation(dev2_path1_id, info.name(), device_id, relative_path,
+  AddGalleryExpectation(dev2_path1_id, gallery_name, device_id, relative_path,
                         MediaGalleryPrefInfo::kUserAdded);
   Verify();
 
   relative_path = base::FilePath(FILE_PATH_LITERAL("path2/on/device2"));
-  info.set_name(ASCIIToUTF16("Device2Path2"));
+  gallery_name = base::ASCIIToUTF16("Device2Path2");
   MediaGalleryPrefId dev2_path2_id = AddGalleryWithNameV1(
-      device_id, info.name(), relative_path, true /*user*/);
+      device_id, gallery_name, relative_path, true /*user*/);
   EXPECT_EQ(default_galleries_count() + 5UL, dev2_path2_id);
-  AddGalleryExpectation(dev2_path2_id, info.name(), device_id, relative_path,
+  AddGalleryExpectation(dev2_path2_id, gallery_name, device_id, relative_path,
                         MediaGalleryPrefInfo::kUserAdded);
   Verify();
 
   // Check that adding one of them again works as expected.
   MediaGalleryPrefId id = AddGalleryWithNameV1(
-      device_id, info.name(), relative_path, true /*user*/);
+      device_id, gallery_name, relative_path, true /*user*/);
   EXPECT_EQ(dev2_path2_id, id);
   Verify();
 }
 
 TEST_F(MediaGalleriesPreferencesTest, GalleryChangeObserver) {
   // Start with one observer.
   MockGalleryChangeObserver observer1(gallery_prefs());
   gallery_prefs()->AddGalleryChangeObserver(&observer1);
 
   // Add a new auto detected gallery.
   base::FilePath path = MakeMediaGalleriesTestingPath("new_auto");
   StorageInfo info;
   base::FilePath relative_path;
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewAutoGallery"));
+  base::string16 gallery_name = base::ASCIIToUTF16("NewAutoGallery");
   MediaGalleryPrefId auto_id = AddGalleryWithNameV1(
-      info.device_id(), info.name(), relative_path, false /*auto*/);
+      info.device_id(), gallery_name, relative_path, false /*auto*/);
   EXPECT_EQ(default_galleries_count() + 1UL, auto_id);
-  AddGalleryExpectation(auto_id, info.name(), info.device_id(),
+  AddGalleryExpectation(auto_id, gallery_name, info.device_id(),
                         relative_path, MediaGalleryPrefInfo::kAutoDetected);
   EXPECT_EQ(1, observer1.notifications());
 
   // Add a second observer.
   MockGalleryChangeObserver observer2(gallery_prefs());
   gallery_prefs()->AddGalleryChangeObserver(&observer2);
 
   // Add a new user added gallery.
   path = MakeMediaGalleriesTestingPath("new_user");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewUserGallery"));
+  gallery_name = base::ASCIIToUTF16("NewUserGallery");
   MediaGalleryPrefId user_added_id =
-      AddGalleryWithNameV1(info.device_id(), info.name(),
-                           relative_path, true /*user*/);
-  AddGalleryExpectation(user_added_id, info.name(), info.device_id(),
+      AddGalleryWithNameV1(info.device_id(), gallery_name, relative_path,
+                           true /*user*/);
+  AddGalleryExpectation(user_added_id, gallery_name, info.device_id(),
                         relative_path, MediaGalleryPrefInfo::kUserAdded);
   EXPECT_EQ(default_galleries_count() + 2UL, user_added_id);
   EXPECT_EQ(2, observer1.notifications());
   EXPECT_EQ(1, observer2.notifications());
 
   // Remove the first observer.
   gallery_prefs()->RemoveGalleryChangeObserver(&observer1);
 
   // Remove an auto added gallery (i.e. make it blacklisted).
   gallery_prefs()->ForgetGalleryById(auto_id);
@@ skipping 15 matching lines @@
 TEST_F(MediaGalleriesPreferencesTest, UpdateSingletonDeviceIdType) {
   MediaGalleryPrefId id;
   base::FilePath path;
   StorageInfo info;
   base::FilePath relative_path;
   Verify();
 
   // Add a new auto detect gallery to test with.
   path = MakeMediaGalleriesTestingPath("new_auto");
   MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path);
-  info.set_name(ASCIIToUTF16("NewAutoGallery"));
+  base::string16 gallery_name = base::ASCIIToUTF16("NewAutoGallery");
   info.set_device_id(StorageInfo::MakeDeviceId(StorageInfo::ITUNES,
                                                path.AsUTF8Unsafe()));
-  id = AddGalleryWithNameV2(info.device_id(), info.name(), relative_path,
+  id = AddGalleryWithNameV2(info.device_id(), gallery_name, relative_path,
                             MediaGalleryPrefInfo::kAutoDetected);
   EXPECT_EQ(default_galleries_count() + 1UL, id);
-  AddGalleryExpectation(id, info.name(), info.device_id(), relative_path,
+  AddGalleryExpectation(id, gallery_name, info.device_id(), relative_path,
                         MediaGalleryPrefInfo::kAutoDetected);
   Verify();
 
   // Update the device id.
   MockGalleryChangeObserver observer(gallery_prefs());
   gallery_prefs()->AddGalleryChangeObserver(&observer);
 
   path = MakeMediaGalleriesTestingPath("updated_path");
   std::string updated_device_id =
       StorageInfo::MakeDeviceId(StorageInfo::ITUNES, path.AsUTF8Unsafe());
   EXPECT_TRUE(UpdateDeviceIDForSingletonType(updated_device_id));
-  AddGalleryExpectation(id, info.name(), updated_device_id, relative_path,
+  AddGalleryExpectation(id, gallery_name, updated_device_id, relative_path,
                         MediaGalleryPrefInfo::kAutoDetected);
   expected_device_map[info.device_id()].erase(id);
   expected_device_map[updated_device_id].insert(id);
   Verify();
   EXPECT_EQ(1, observer.notifications());
 
   // No gallery for type.
   std::string new_device_id =
       StorageInfo::MakeDeviceId(StorageInfo::PICASA, path.AsUTF8Unsafe());
   EXPECT_FALSE(UpdateDeviceIDForSingletonType(new_device_id));
@@ skipping 96 matching lines @@
   info.volume_label = base::string16();
   EXPECT_EQ(ASCIIToUTF16("vendor, model"), info.GetGalleryDisplayName());
 
   info.device_id = StorageInfo::MakeDeviceId(
       StorageInfo::FIXED_MASS_STORAGE, "unique");
   EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("unique")).AsUTF8Unsafe(),
             base::UTF16ToUTF8(info.GetGalleryTooltip()));
 
   TestStorageMonitor::Destroy();
 }