[fsp] Rename file_system_name to display_name for consistency.

On the JS side, the argument is called displayName, so on C++ side it should
be display_name for consistency.

TBR=nkostylev@chromium.org
TEST=Not related. Refactoring only.
BUG=248427

Review URL: https://codereview.chromium.org/375793003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281717 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/file_manager/volume_manager.cc

@@ -215,7 +215,7 @@ VolumeInfo CreateProvidedFileSystemVolumeInfo(
   VolumeInfo volume_info;
   volume_info.file_system_id = file_system_info.file_system_id();
   volume_info.extension_id = file_system_info.extension_id();
-  volume_info.volume_label = file_system_info.file_system_name();
+  volume_info.volume_label = file_system_info.display_name();
   volume_info.type = VOLUME_TYPE_PROVIDED;
   volume_info.mount_path = file_system_info.mount_path();
   volume_info.mount_condition = chromeos::disks::MOUNT_CONDITION_NONE;

chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc

@@ -33,7 +33,7 @@ namespace {
 
 const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
 const char kFileSystemId[] = "File/System/Id";
-const char kFileSystemName[] = "Camera Pictures";
+const char kDisplayName[] = "Camera Pictures";
 
 // Creates a FileSystemURL for tests.
 fileapi::FileSystemURL CreateFileSystemURL(
@@ -127,7 +127,7 @@ TEST_F(FileSystemProviderMountPathUtilTest, IsFileSystemProviderLocalPath) {
 
 TEST_F(FileSystemProviderMountPathUtilTest, Parser) {
   const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+      kExtensionId, kFileSystemId, kDisplayName);
   ASSERT_TRUE(result);
   const ProvidedFileSystemInfo file_system_info =
       file_system_provider_service_->GetProvidedFileSystem(kExtensionId,
@@ -151,7 +151,7 @@ TEST_F(FileSystemProviderMountPathUtilTest, Parser) {
 
 TEST_F(FileSystemProviderMountPathUtilTest, Parser_RootPath) {
   const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+      kExtensionId, kFileSystemId, kDisplayName);
   ASSERT_TRUE(result);
   const ProvidedFileSystemInfo file_system_info =
       file_system_provider_service_->GetProvidedFileSystem(kExtensionId,
@@ -176,7 +176,7 @@ TEST_F(FileSystemProviderMountPathUtilTest, Parser_WrongUrl) {
   const ProvidedFileSystemInfo file_system_info(
       kExtensionId,
       kFileSystemId,
-      kFileSystemName,
+      kDisplayName,
       GetMountPath(profile_, kExtensionId, kFileSystemId));
 
   const base::FilePath kFilePath = base::FilePath::FromUTF8Unsafe("/hello");
@@ -192,7 +192,7 @@ TEST_F(FileSystemProviderMountPathUtilTest, Parser_WrongUrl) {
 
 TEST_F(FileSystemProviderMountPathUtilTest, Parser_IsolatedURL) {
   const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+      kExtensionId, kFileSystemId, kDisplayName);
   ASSERT_TRUE(result);
   const ProvidedFileSystemInfo file_system_info =
       file_system_provider_service_->GetProvidedFileSystem(kExtensionId,
@@ -238,7 +238,7 @@ TEST_F(FileSystemProviderMountPathUtilTest, Parser_IsolatedURL) {
 
 TEST_F(FileSystemProviderMountPathUtilTest, LocalPathParser) {
   const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+      kExtensionId, kFileSystemId, kDisplayName);
   ASSERT_TRUE(result);
   const ProvidedFileSystemInfo file_system_info =
       file_system_provider_service_->GetProvidedFileSystem(kExtensionId,
@@ -262,7 +262,7 @@ TEST_F(FileSystemProviderMountPathUtilTest, LocalPathParser) {
 
 TEST_F(FileSystemProviderMountPathUtilTest, LocalPathParser_RootPath) {
   const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+      kExtensionId, kFileSystemId, kDisplayName);
   ASSERT_TRUE(result);
   const ProvidedFileSystemInfo file_system_info =
       file_system_provider_service_->GetProvidedFileSystem(kExtensionId,

chrome/browser/chromeos/file_system_provider/notification_manager.cc

@@ -130,7 +130,7 @@ NotificationManager::CreateNotification() {
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE,
           file_system_info_.mount_path().value(),
-          base::UTF8ToUTF16(file_system_info_.file_system_name()),
+          base::UTF8ToUTF16(file_system_info_.display_name()),
           l10n_util::GetStringUTF16(
               callbacks_.size() == 1
                   ? IDS_FILE_SYSTEM_PROVIDER_UNRESPONSIVE_WARNING

chrome/browser/chromeos/file_system_provider/operations/close_file_unittest.cc

@@ -39,7 +39,7 @@ class FileSystemProviderOperationsCloseFileTest : public testing::Test {
     file_system_info_ =
         ProvidedFileSystemInfo(kExtensionId,
                                kFileSystemId,
-                               "" /* file_system_name */,
+                               "" /* display_name */,
                                base::FilePath() /* mount_path */);
   }
 

chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc

@@ -76,7 +76,7 @@ class FileSystemProviderOperationsGetMetadataTest : public testing::Test {
     file_system_info_ =
         ProvidedFileSystemInfo(kExtensionId,
                                kFileSystemId,
-                               "" /* file_system_name */,
+                               "" /* display_name */,
                                base::FilePath() /* mount_path */);
   }
 

chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc

@@ -75,7 +75,7 @@ class FileSystemProviderOperationsOpenFileTest : public testing::Test {
     file_system_info_ =
         ProvidedFileSystemInfo(kExtensionId,
                                kFileSystemId,
-                               "" /* file_system_name */,
+                               "" /* display_name */,
                                base::FilePath() /* mount_path */);
   }
 

chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc

@@ -83,7 +83,7 @@ class FileSystemProviderOperationsReadDirectoryTest : public testing::Test {
     file_system_info_ =
         ProvidedFileSystemInfo(kExtensionId,
                                kFileSystemId,
-                               "" /* file_system_name */,
+                               "" /* display_name */,
                                base::FilePath() /* mount_path */);
   }
 

chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc

@@ -80,7 +80,7 @@ class FileSystemProviderOperationsReadFileTest : public testing::Test {
     file_system_info_ =
         ProvidedFileSystemInfo(kExtensionId,
                                kFileSystemId,
-                               "" /* file_system_name */,
+                               "" /* display_name */,
                                base::FilePath() /* mount_path */);
     io_buffer_ = make_scoped_refptr(new net::IOBuffer(kOffset + kLength));
   }

chrome/browser/chromeos/file_system_provider/operations/unmount_unittest.cc

@@ -37,7 +37,7 @@ class FileSystemProviderOperationsUnmountTest : public testing::Test {
     file_system_info_ =
         ProvidedFileSystemInfo(kExtensionId,
                                kFileSystemId,
-                               "" /* file_system_name */,
+                               "" /* display_name */,
                                base::FilePath() /* mount_path */);
   }
 

chrome/browser/chromeos/file_system_provider/provided_file_system_info.cc

@@ -12,11 +12,11 @@ ProvidedFileSystemInfo::ProvidedFileSystemInfo() {}
 ProvidedFileSystemInfo::ProvidedFileSystemInfo(
     const std::string& extension_id,
     const std::string& file_system_id,
-    const std::string& file_system_name,
+    const std::string& display_name,
     const base::FilePath& mount_path)
     : extension_id_(extension_id),
       file_system_id_(file_system_id),
-      file_system_name_(file_system_name),
+      display_name_(display_name),
       mount_path_(mount_path) {
 }
 

chrome/browser/chromeos/file_system_provider/provided_file_system_info.h

@@ -18,14 +18,14 @@ class ProvidedFileSystemInfo {
   ProvidedFileSystemInfo();
   ProvidedFileSystemInfo(const std::string& extension_id,
                          const std::string& file_system_id,
-                         const std::string& file_system_name,
+                         const std::string& display_name,
                          const base::FilePath& mount_path);
 
   ~ProvidedFileSystemInfo();
 
   const std::string& extension_id() const { return extension_id_; }
   const std::string& file_system_id() const { return file_system_id_; }
-  const std::string& file_system_name() const { return file_system_name_; }
+  const std::string& display_name() const { return display_name_; }
   const base::FilePath& mount_path() const { return mount_path_; }
 
  private:
@@ -36,7 +36,7 @@ class ProvidedFileSystemInfo {
   std::string file_system_id_;
 
   // Name of the file system, can be rendered in the UI.
-  std::string file_system_name_;
+  std::string display_name_;
 
   // Mount path of the underlying file system.
   base::FilePath mount_path_;

chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc

@@ -31,7 +31,7 @@ namespace {
 const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
 const int kExpectedRequestId = 1;
 const char kFileSystemId[] = "camera-pictures";
-const char kFileSystemName[] = "Camera Pictures";
+const char kDisplayName[] = "Camera Pictures";
 
 class FakeEventRouter : public extensions::EventRouter {
  public:
@@ -90,7 +90,7 @@ class FileSystemProviderProvidedFileSystemTest : public testing::Test {
     const base::FilePath mount_path =
         util::GetMountPath(profile_.get(), kExtensionId, kFileSystemId);
     file_system_info_.reset(new ProvidedFileSystemInfo(
-        kExtensionId, kFileSystemId, kFileSystemName, mount_path));
+        kExtensionId, kFileSystemId, kDisplayName, mount_path));
     provided_file_system_.reset(
         new ProvidedFileSystem(event_router_.get(), *file_system_info_.get()));
   }

chrome/browser/chromeos/file_system_provider/service.cc

@@ -38,7 +38,7 @@ ProvidedFileSystemInterface* CreateProvidedFileSystem(
 }  // namespace
 
 const char kPrefKeyFileSystemId[] = "file-system-id";
-const char kPrefKeyFileSystemName[] = "file-system-name";
+const char kPrefKeyDisplayName[] = "display-name";
 
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(
@@ -97,7 +97,7 @@ void Service::SetFileSystemFactoryForTesting(
 
 bool Service::MountFileSystem(const std::string& extension_id,
                               const std::string& file_system_id,
-                              const std::string& file_system_name) {
+                              const std::string& display_name) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // If already exists a file system provided by the same extension with this
@@ -149,7 +149,7 @@ bool Service::MountFileSystem(const std::string& extension_id,
   //   mount_point_name =  b33f1337-41-5aa5
   //   mount_path = /provided/b33f1337-41-5aa5
   ProvidedFileSystemInfo file_system_info(
-      extension_id, file_system_id, file_system_name, mount_path);
+      extension_id, file_system_id, display_name, mount_path);
 
   ProvidedFileSystemInterface* file_system =
       file_system_factory_.Run(profile_, file_system_info);
@@ -331,7 +331,7 @@ void Service::RememberFileSystems() {
 
     base::DictionaryValue* file_system = new base::DictionaryValue();
     file_system->SetString(kPrefKeyFileSystemId, it->file_system_id());
-    file_system->SetString(kPrefKeyFileSystemName, it->file_system_name());
+    file_system->SetString(kPrefKeyDisplayName, it->display_name());
     file_systems->Append(file_system);
   }
 
@@ -374,22 +374,22 @@ void Service::RestoreFileSystems(const std::string& extension_id) {
     file_system->GetString(kPrefKeyFileSystemId, &file_system_id);
     DCHECK(!file_system_id.empty());
 
-    std::string file_system_name;
-    file_system->GetString(kPrefKeyFileSystemName, &file_system_name);
-    DCHECK(!file_system_name.empty());
+    std::string display_name;
+    file_system->GetString(kPrefKeyDisplayName, &display_name);
+    DCHECK(!display_name.empty());
 
-    if (file_system_id.empty() || file_system_name.empty()) {
+    if (file_system_id.empty() || display_name.empty()) {
       LOG(ERROR)
           << "Malformed provided file system information in preferences.";
       continue;
     }
 
     const bool result =
-        MountFileSystem(extension_id, file_system_id, file_system_name);
+        MountFileSystem(extension_id, file_system_id, display_name);
     if (!result) {
       LOG(ERROR) << "Failed to restore a provided file system from "
                  << "preferences: " << extension_id << ", " << file_system_id
-                 << ", " << file_system_name << ".";
+                 << ", " << display_name << ".";
     }
   }
 }

chrome/browser/chromeos/file_system_provider/service.h

@@ -38,7 +38,7 @@ namespace file_system_provider {
 
 // Key names for preferences.
 extern const char kPrefKeyFileSystemId[];
-extern const char kPrefKeyFileSystemName[];
+extern const char kPrefKeyDisplayName[];
 
 class ProvidedFileSystemFactoryInterface;
 class ProvidedFileSystemInfo;
@@ -70,7 +70,7 @@ class Service : public KeyedService,
   // For success, returns true, otherwise false.
   bool MountFileSystem(const std::string& extension_id,
                        const std::string& file_system_id,
-                       const std::string& file_system_name);
+                       const std::string& display_name);
 
   // Unmounts a file system with the specified |file_system_id| for the
   // |extension_id|. For success returns true, otherwise false.

chrome/browser/chromeos/file_system_provider/service_unittest.cc

@@ -33,7 +33,7 @@ namespace {
 
 const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
 const char kFileSystemId[] = "camera/pictures/id !@#$%^&*()_+";
-const char kFileSystemName[] = "Camera Pictures";
+const char kDisplayName[] = "Camera Pictures";
 
 // Utility observer, logging events from file_system_provider::Service.
 class LoggingObserver : public Observer {
@@ -94,7 +94,7 @@ scoped_refptr<extensions::Extension> createFakeExtension(
 void RememberFakeFileSystem(TestingProfile* profile,
                             const std::string& extension_id,
                             const std::string& file_system_id,
-                            const std::string& file_system_name) {
+                            const std::string& display_name) {
   TestingPrefServiceSyncable* pref_service = profile->GetTestingPrefService();
   ASSERT_TRUE(pref_service);
 
@@ -102,7 +102,7 @@ void RememberFakeFileSystem(TestingProfile* profile,
   base::ListValue* file_systems = new base::ListValue();
   base::DictionaryValue* file_system = new base::DictionaryValue();
   file_system->SetString(kPrefKeyFileSystemId, kFileSystemId);
-  file_system->SetString(kPrefKeyFileSystemName, kFileSystemName);
+  file_system->SetString(kPrefKeyDisplayName, kDisplayName);
   file_systems->Append(file_system);
   extensions.Set(kExtensionId, file_systems);
 
@@ -144,7 +144,7 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem) {
   file_system_provider_service_->AddObserver(&observer);
 
   const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+      kExtensionId, kFileSystemId, kDisplayName);
   EXPECT_TRUE(result);
 
   ASSERT_EQ(1u, observer.mounts.size());
@@ -155,8 +155,7 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem) {
       util::GetMountPath(profile_.get(), kExtensionId, kFileSystemId);
   EXPECT_EQ(expected_mount_path.AsUTF8Unsafe(),
             observer.mounts[0].file_system_info().mount_path().AsUTF8Unsafe());
-  EXPECT_EQ(kFileSystemName,
-            observer.mounts[0].file_system_info().file_system_name());
+  EXPECT_EQ(kDisplayName, observer.mounts[0].file_system_info().display_name());
   EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
   ASSERT_EQ(0u, observer.unmounts.size());
 
@@ -172,11 +171,11 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem_UniqueIds) {
   file_system_provider_service_->AddObserver(&observer);
 
   const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+      kExtensionId, kFileSystemId, kDisplayName);
   EXPECT_TRUE(result);
 
   const bool second_result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+      kExtensionId, kFileSystemId, kDisplayName);
   EXPECT_FALSE(second_result);
 
   ASSERT_EQ(2u, observer.mounts.size());
@@ -199,14 +198,14 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem_StressTest) {
     const std::string file_system_id =
         std::string("test-") + base::IntToString(i);
     const bool result = file_system_provider_service_->MountFileSystem(
-        kExtensionId, file_system_id, kFileSystemName);
+        kExtensionId, file_system_id, kDisplayName);
     EXPECT_TRUE(result);
   }
   ASSERT_EQ(kMaxFileSystems, observer.mounts.size());
 
   // The next file system is out of limit, and registering it should fail.
   const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+      kExtensionId, kFileSystemId, kDisplayName);
   EXPECT_FALSE(result);
 
   ASSERT_EQ(kMaxFileSystems + 1, observer.mounts.size());
@@ -225,7 +224,7 @@ TEST_F(FileSystemProviderServiceTest, UnmountFileSystem) {
   file_system_provider_service_->AddObserver(&observer);
 
   const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+      kExtensionId, kFileSystemId, kDisplayName);
   EXPECT_TRUE(result);
   ASSERT_EQ(1u, observer.mounts.size());
 
@@ -252,7 +251,7 @@ TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_OnExtensionUnload) {
   file_system_provider_service_->AddObserver(&observer);
 
   const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+      kExtensionId, kFileSystemId, kDisplayName);
   EXPECT_TRUE(result);
   ASSERT_EQ(1u, observer.mounts.size());
 
@@ -284,7 +283,7 @@ TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_WrongExtensionId) {
   const std::string kWrongExtensionId = "helloworldhelloworldhelloworldhe";
 
   const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+      kExtensionId, kFileSystemId, kDisplayName);
   EXPECT_TRUE(result);
   ASSERT_EQ(1u, observer.mounts.size());
   ASSERT_EQ(
@@ -313,7 +312,7 @@ TEST_F(FileSystemProviderServiceTest, RestoreFileSystem_OnExtensionLoad) {
 
   // Create a fake entry in the preferences.
   RememberFakeFileSystem(
-      profile_.get(), kExtensionId, kFileSystemId, kFileSystemName);
+      profile_.get(), kExtensionId, kFileSystemId, kDisplayName);
 
   EXPECT_EQ(0u, observer.mounts.size());
 
@@ -341,7 +340,7 @@ TEST_F(FileSystemProviderServiceTest, ForgetFileSystem_OnExtensionUnload) {
 
   // Create a fake entry in the preferences.
   RememberFakeFileSystem(
-      profile_.get(), kExtensionId, kFileSystemId, kFileSystemName);
+      profile_.get(), kExtensionId, kFileSystemId, kDisplayName);
 
   // Directly call the observer's methods.
   file_system_provider_service_->OnExtensionLoaded(profile_.get(),
@@ -381,7 +380,7 @@ TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnShutdown) {
     service->AddObserver(&observer);
 
     const bool result =
-        service->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
+        service->MountFileSystem(kExtensionId, kFileSystemId, kDisplayName);
     EXPECT_TRUE(result);
     ASSERT_EQ(1u, observer.mounts.size());
 
@@ -406,9 +405,9 @@ TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnShutdown) {
   file_system->GetString(kPrefKeyFileSystemId, &file_system_id);
   EXPECT_EQ(kFileSystemId, file_system_id);
 
-  std::string file_system_name;
-  file_system->GetString(kPrefKeyFileSystemName, &file_system_name);
-  EXPECT_EQ(kFileSystemName, file_system_name);
+  std::string display_name;
+  file_system->GetString(kPrefKeyDisplayName, &display_name);
+  EXPECT_EQ(kDisplayName, display_name);
 }
 
 }  // namespace file_system_provider

chrome/browser/ui/webui/chromeos/provided_file_systems_ui.cc

@@ -289,7 +289,7 @@ void ProvidedFileSystemsWebUIHandler::UpdateFileSystems(
 
     base::DictionaryValue* item = new base::DictionaryValue();
     item->SetString(kKeyId, file_system_info.file_system_id());
-    item->SetString(kKeyName, file_system_info.file_system_name());
+    item->SetString(kKeyName, file_system_info.display_name());
     item->SetString(kKeyExtensionId, file_system_info.extension_id());
     item->SetString(kKeyMountPath,
                     file_system_info.mount_path().AsUTF8Unsafe());