[fsp] Rename file_system_name to display_name for consistency.

chrome/browser/chromeos/file_system_provider/service_unittest.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/chromeos/file_system_provider/service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/files/file.h"
@@ skipping 15 matching lines @@
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 
 namespace chromeos {
 namespace file_system_provider {
 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 {
  public:
   class Event {
    public:
     Event(const ProvidedFileSystemInfo& file_system_info,
           base::File::Error error)
         : file_system_info_(file_system_info), error_(error) {}
     ~Event() {}
@@ skipping 40 matching lines @@
                                        manifest,
                                        extensions::Extension::NO_FLAGS,
                                        extension_id,
                                        &error);
 }
 
 // Stores a provided file system information in preferences.
 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);
 
   base::DictionaryValue extensions;
   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);
 
   pref_service->Set(prefs::kFileSystemProviderMounted, extensions);
 }
 
 }  // namespace
 
 class FileSystemProviderServiceTest : public testing::Test {
  protected:
@@ skipping 21 matching lines @@
   scoped_ptr<extensions::ExtensionRegistry> extension_registry_;
   scoped_ptr<Service> file_system_provider_service_;
   scoped_refptr<extensions::Extension> extension_;
 };
 
 TEST_F(FileSystemProviderServiceTest, MountFileSystem) {
   LoggingObserver observer;
   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());
   EXPECT_EQ(kExtensionId, observer.mounts[0].file_system_info().extension_id());
   EXPECT_EQ(kFileSystemId,
             observer.mounts[0].file_system_info().file_system_id());
   base::FilePath expected_mount_path =
       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());
 
   std::vector<ProvidedFileSystemInfo> file_system_info_list =
       file_system_provider_service_->GetProvidedFileSystemInfoList();
   ASSERT_EQ(1u, file_system_info_list.size());
 
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, MountFileSystem_UniqueIds) {
   LoggingObserver observer;
   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());
   EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
   EXPECT_EQ(base::File::FILE_ERROR_EXISTS, observer.mounts[1].error());
 
   std::vector<ProvidedFileSystemInfo> file_system_info_list =
       file_system_provider_service_->GetProvidedFileSystemInfoList();
   ASSERT_EQ(1u, file_system_info_list.size());
 
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, MountFileSystem_StressTest) {
   LoggingObserver observer;
   file_system_provider_service_->AddObserver(&observer);
 
   const size_t kMaxFileSystems = 16;
   for (size_t i = 0; i < kMaxFileSystems; ++i) {
     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());
   EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED,
             observer.mounts[kMaxFileSystems].error());
 
   std::vector<ProvidedFileSystemInfo> file_system_info_list =
       file_system_provider_service_->GetProvidedFileSystemInfoList();
   ASSERT_EQ(kMaxFileSystems, file_system_info_list.size());
 
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, UnmountFileSystem) {
   LoggingObserver observer;
   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());
 
   const bool unmount_result = file_system_provider_service_->UnmountFileSystem(
       kExtensionId, kFileSystemId);
   EXPECT_TRUE(unmount_result);
   ASSERT_EQ(1u, observer.unmounts.size());
   EXPECT_EQ(base::File::FILE_OK, observer.unmounts[0].error());
 
   EXPECT_EQ(kExtensionId,
             observer.unmounts[0].file_system_info().extension_id());
   EXPECT_EQ(kFileSystemId,
             observer.unmounts[0].file_system_info().file_system_id());
 
   std::vector<ProvidedFileSystemInfo> file_system_info_list =
       file_system_provider_service_->GetProvidedFileSystemInfoList();
   ASSERT_EQ(0u, file_system_info_list.size());
 
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_OnExtensionUnload) {
   LoggingObserver observer;
   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());
 
   // Directly call the observer's method.
   file_system_provider_service_->OnExtensionUnloaded(
       profile_.get(),
       extension_.get(),
       extensions::UnloadedExtensionInfo::REASON_DISABLE);
 
   ASSERT_EQ(1u, observer.unmounts.size());
@@ skipping 11 matching lines @@
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_WrongExtensionId) {
   LoggingObserver observer;
   file_system_provider_service_->AddObserver(&observer);
 
   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(
       1u,
       file_system_provider_service_->GetProvidedFileSystemInfoList().size());
 
   const bool unmount_result = file_system_provider_service_->UnmountFileSystem(
       kWrongExtensionId, kFileSystemId);
   EXPECT_FALSE(unmount_result);
   ASSERT_EQ(1u, observer.unmounts.size());
   EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, observer.unmounts[0].error());
   ASSERT_EQ(
       1u,
       file_system_provider_service_->GetProvidedFileSystemInfoList().size());
 
   std::vector<ProvidedFileSystemInfo> file_system_info_list =
       file_system_provider_service_->GetProvidedFileSystemInfoList();
   ASSERT_EQ(1u, file_system_info_list.size());
 
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, RestoreFileSystem_OnExtensionLoad) {
   LoggingObserver observer;
   file_system_provider_service_->AddObserver(&observer);
 
   // Create a fake entry in the preferences.
   RememberFakeFileSystem(
-      profile_.get(), kExtensionId, kFileSystemId, kFileSystemName);
+      profile_.get(), kExtensionId, kFileSystemId, kDisplayName);
 
   EXPECT_EQ(0u, observer.mounts.size());
 
   // Directly call the observer's method.
   file_system_provider_service_->OnExtensionLoaded(profile_.get(),
                                                    extension_.get());
 
   ASSERT_EQ(1u, observer.mounts.size());
   EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
 
   EXPECT_EQ(kExtensionId, observer.mounts[0].file_system_info().extension_id());
   EXPECT_EQ(kFileSystemId,
             observer.mounts[0].file_system_info().file_system_id());
 
   std::vector<ProvidedFileSystemInfo> file_system_info_list =
       file_system_provider_service_->GetProvidedFileSystemInfoList();
   ASSERT_EQ(1u, file_system_info_list.size());
 
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, ForgetFileSystem_OnExtensionUnload) {
   LoggingObserver observer;
   file_system_provider_service_->AddObserver(&observer);
 
   // 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(),
                                                    extension_.get());
 
   file_system_provider_service_->OnExtensionUnloaded(
       profile_.get(),
       extension_.get(),
       extensions::UnloadedExtensionInfo::REASON_DISABLE);
 
@@ skipping 19 matching lines @@
   {
     scoped_ptr<Service> service(
         new Service(profile_.get(), extension_registry_.get()));
     service->SetFileSystemFactoryForTesting(
         base::Bind(&FakeProvidedFileSystem::Create));
 
     LoggingObserver observer;
     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());
 
     service->RemoveObserver(&observer);
   }
 
   TestingPrefServiceSyncable* pref_service = profile_->GetTestingPrefService();
   ASSERT_TRUE(pref_service);
 
   const base::DictionaryValue* extensions =
       pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
   ASSERT_TRUE(extensions);
 
   const base::ListValue* file_systems;
   ASSERT_TRUE(extensions->GetList(kExtensionId, &file_systems));
   ASSERT_EQ(1u, file_systems->GetSize());
 
   const base::DictionaryValue* file_system = NULL;
   ASSERT_TRUE(file_systems->GetDictionary(0, &file_system));
 
   std::string file_system_id;
   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
 }  // namespace chromeos