[fsp] Remember mounted file systems as soon as possible.

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 <string>
 #include <vector>
 
 #include "base/files/file.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 13 matching lines @@
 #include "extensions/common/extension.h"
 #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";
 
+// The dot in the file system ID is there in order to check that saving to
+// preferences works correctly. File System ID is used as a key in
+// a base::DictionaryValue, so it has to be stored without path expansion.
+const char kFileSystemId[] = "camera/pictures/id .!@#$%^&*()_+";
+
 // 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 44 matching lines @@
 
 // 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) {
   TestingPrefServiceSyncable* pref_service = profile->GetTestingPrefService();
   ASSERT_TRUE(pref_service);
 
   base::DictionaryValue extensions;
-  base::ListValue* file_systems = new base::ListValue();
+  base::DictionaryValue* file_systems = new base::DictionaryValue();
   base::DictionaryValue* file_system = new base::DictionaryValue();
   file_system->SetString(kPrefKeyFileSystemId, kFileSystemId);
   file_system->SetString(kPrefKeyFileSystemName, kFileSystemName);
-  file_systems->Append(file_system);
+  file_systems->SetWithoutPathExpansion(kFileSystemId, file_system);
   extensions.Set(kExtensionId, file_systems);
 
   pref_service->Set(prefs::kFileSystemProviderMounted, extensions);
 }
 
 }  // namespace
 
 class FileSystemProviderServiceTest : public testing::Test {
  protected:
   FileSystemProviderServiceTest() {}
   virtual ~FileSystemProviderServiceTest() {}
 
   virtual void SetUp() OVERRIDE {
     profile_.reset(new TestingProfile);
     user_manager_ = new FakeUserManager();
     user_manager_->AddUser(profile_->GetProfileName());
     user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_));
     extension_registry_.reset(
         new extensions::ExtensionRegistry(profile_.get()));
-    file_system_provider_service_.reset(
-        new Service(profile_.get(), extension_registry_.get()));
-    file_system_provider_service_->SetFileSystemFactoryForTesting(
+    service_.reset(new Service(profile_.get(), extension_registry_.get()));
+    service_->SetFileSystemFactoryForTesting(
         base::Bind(&FakeProvidedFileSystem::Create));
     extension_ = createFakeExtension(kExtensionId);
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfile> profile_;
   FakeUserManager* user_manager_;
   scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
   scoped_ptr<extensions::ExtensionRegistry> extension_registry_;
-  scoped_ptr<Service> file_system_provider_service_;
+  scoped_ptr<Service> service_;
   scoped_refptr<extensions::Extension> extension_;
 };
 
 TEST_F(FileSystemProviderServiceTest, MountFileSystem) {
   LoggingObserver observer;
-  file_system_provider_service_->AddObserver(&observer);
+  service_->AddObserver(&observer);
 
-  const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+  const bool result =
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
   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(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();
+      service_->GetProvidedFileSystemInfoList();
   ASSERT_EQ(1u, file_system_info_list.size());
 
-  file_system_provider_service_->RemoveObserver(&observer);
+  service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, MountFileSystem_UniqueIds) {
   LoggingObserver observer;
-  file_system_provider_service_->AddObserver(&observer);
+  service_->AddObserver(&observer);
 
-  const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+  const bool result =
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
   EXPECT_TRUE(result);
 
-  const bool second_result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+  const bool second_result =
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
   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();
+      service_->GetProvidedFileSystemInfoList();
   ASSERT_EQ(1u, file_system_info_list.size());
 
-  file_system_provider_service_->RemoveObserver(&observer);
+  service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, MountFileSystem_StressTest) {
   LoggingObserver observer;
-  file_system_provider_service_->AddObserver(&observer);
+  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(
+    const bool result = service_->MountFileSystem(
         kExtensionId, file_system_id, kFileSystemName);
     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);
+  const bool result =
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
   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();
+      service_->GetProvidedFileSystemInfoList();
   ASSERT_EQ(kMaxFileSystems, file_system_info_list.size());
 
-  file_system_provider_service_->RemoveObserver(&observer);
+  service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, UnmountFileSystem) {
   LoggingObserver observer;
-  file_system_provider_service_->AddObserver(&observer);
+  service_->AddObserver(&observer);
 
-  const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+  const bool result =
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
   EXPECT_TRUE(result);
   ASSERT_EQ(1u, observer.mounts.size());
 
-  const bool unmount_result = file_system_provider_service_->UnmountFileSystem(
-      kExtensionId, kFileSystemId);
+  const bool unmount_result = service_->UnmountFileSystem(
+      kExtensionId, kFileSystemId, Service::UNMOUNT_REASON_USER);
   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();
+      service_->GetProvidedFileSystemInfoList();
   ASSERT_EQ(0u, file_system_info_list.size());
 
-  file_system_provider_service_->RemoveObserver(&observer);
+  service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_OnExtensionUnload) {
   LoggingObserver observer;
-  file_system_provider_service_->AddObserver(&observer);
+  service_->AddObserver(&observer);
 
-  const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+  const bool result =
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
   EXPECT_TRUE(result);
   ASSERT_EQ(1u, observer.mounts.size());
 
   // Directly call the observer's method.
-  file_system_provider_service_->OnExtensionUnloaded(
+  service_->OnExtensionUnloaded(
       profile_.get(),
       extension_.get(),
       extensions::UnloadedExtensionInfo::REASON_DISABLE);
 
   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();
+      service_->GetProvidedFileSystemInfoList();
   ASSERT_EQ(0u, file_system_info_list.size());
 
-  file_system_provider_service_->RemoveObserver(&observer);
+  service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_WrongExtensionId) {
   LoggingObserver observer;
-  file_system_provider_service_->AddObserver(&observer);
+  service_->AddObserver(&observer);
 
   const std::string kWrongExtensionId = "helloworldhelloworldhelloworldhe";
 
-  const bool result = file_system_provider_service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kFileSystemName);
+  const bool result =
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
   EXPECT_TRUE(result);
   ASSERT_EQ(1u, observer.mounts.size());
-  ASSERT_EQ(
-      1u,
-      file_system_provider_service_->GetProvidedFileSystemInfoList().size());
+  ASSERT_EQ(1u, service_->GetProvidedFileSystemInfoList().size());
 
-  const bool unmount_result = file_system_provider_service_->UnmountFileSystem(
-      kWrongExtensionId, kFileSystemId);
+  const bool unmount_result = service_->UnmountFileSystem(
+      kWrongExtensionId, kFileSystemId, Service::UNMOUNT_REASON_USER);
   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());
+  ASSERT_EQ(1u, service_->GetProvidedFileSystemInfoList().size());
 
   std::vector<ProvidedFileSystemInfo> file_system_info_list =
-      file_system_provider_service_->GetProvidedFileSystemInfoList();
+      service_->GetProvidedFileSystemInfoList();
   ASSERT_EQ(1u, file_system_info_list.size());
 
-  file_system_provider_service_->RemoveObserver(&observer);
+  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);
 
+  // Create a new service instance in order to load remembered file systems
+  // from preferences.
+  scoped_ptr<Service> file_system_provider_service(
+      new Service(profile_.get(), extension_registry_.get()));
+  LoggingObserver observer;
+  file_system_provider_service->AddObserver(&observer);
+
+  file_system_provider_service->SetFileSystemFactoryForTesting(
+      base::Bind(&FakeProvidedFileSystem::Create));
+
   EXPECT_EQ(0u, observer.mounts.size());
 
   // Directly call the observer's method.
-  file_system_provider_service_->OnExtensionLoaded(profile_.get(),
-                                                   extension_.get());
+  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();
+      file_system_provider_service->GetProvidedFileSystemInfoList();
   ASSERT_EQ(1u, file_system_info_list.size());
 
-  file_system_provider_service_->RemoveObserver(&observer);
+  file_system_provider_service->RemoveObserver(&observer);
 }
 
-TEST_F(FileSystemProviderServiceTest, ForgetFileSystem_OnExtensionUnload) {
+TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnMount) {
   LoggingObserver observer;
-  file_system_provider_service_->AddObserver(&observer);
+  service_->AddObserver(&observer);
 
-  // Create a fake entry in the preferences.
-  RememberFakeFileSystem(
-      profile_.get(), kExtensionId, kFileSystemId, kFileSystemName);
+  const bool result =
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
+  EXPECT_TRUE(result);

[hashimoto, 2014/07/07 11:07:46]

nit: EXPECT_TRUE(service_->MountFileSystem())?

[mtomasz, 2014/07/08 01:52:09]

Done.

+  ASSERT_EQ(1u, observer.mounts.size());
 
-  // 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);
-
-  ASSERT_EQ(1u, observer.mounts.size());
-  EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
-  ASSERT_EQ(1u, observer.unmounts.size());
-  EXPECT_EQ(base::File::FILE_OK, observer.unmounts[0].error());
-
-  TestingPrefServiceSyncable* pref_service = profile_->GetTestingPrefService();
+  TestingPrefServiceSyncable* const pref_service =

[hashimoto, 2014/07/07 11:07:46]

nit: No need to have const here. We don't usually care about the const
correctness of the pointer itself.

[mtomasz, 2014/07/08 01:52:09]

I try to keep File System Provider API code const correct wherever possible.
Keeping const gives us additional compile time bug protection, so let me keep
it.

+      profile_->GetTestingPrefService();
   ASSERT_TRUE(pref_service);
 
-  const base::DictionaryValue* extensions =
+  const base::DictionaryValue* const extensions =
       pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
   ASSERT_TRUE(extensions);
 
-  const base::ListValue* file_systems;
-  EXPECT_FALSE(extensions->GetList(kExtensionId, &file_systems));
+  const base::DictionaryValue* file_systems;

[hashimoto, 2014/07/07 11:07:46]

nit: Initialize with NULL.

[mtomasz, 2014/07/08 01:52:09]

Done.

+  ASSERT_TRUE(extensions->GetDictionary(kExtensionId, &file_systems));
+  ASSERT_EQ(1u, file_systems->size());

[hashimoto, 2014/07/07 11:07:46]

nit: Can be EXPECT.

[mtomasz, 2014/07/08 01:52:09]

Done.

 
-  file_system_provider_service_->RemoveObserver(&observer);
-}
-
-TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnShutdown) {
-  {
-    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);
-    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::Value* file_system_value = NULL;
   const base::DictionaryValue* file_system = NULL;
-  ASSERT_TRUE(file_systems->GetDictionary(0, &file_system));
+  ASSERT_TRUE(
+      file_systems->GetWithoutPathExpansion(kFileSystemId, &file_system_value));
+  ASSERT_TRUE(file_system_value->GetAsDictionary(&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);
+
+  service_->RemoveObserver(&observer);
+}
+
+TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnUnmountOnShutdown) {
+  LoggingObserver observer;
+  service_->AddObserver(&observer);
+
+  TestingPrefServiceSyncable* const pref_service =
+      profile_->GetTestingPrefService();
+  ASSERT_TRUE(pref_service);
+
+  {

[hashimoto, 2014/07/07 11:07:46]

No need to have this scope.

[mtomasz, 2014/07/08 01:52:09]

Having a scope here allows to have the same variable names, hence simple code.

+    const bool mount_result =
+        service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
+    EXPECT_TRUE(mount_result);
+    ASSERT_EQ(1u, observer.mounts.size());
+
+    const base::DictionaryValue* extensions =
+        pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
+    ASSERT_TRUE(extensions);
+
+    const base::DictionaryValue* file_systems;

[hashimoto, 2014/07/07 11:07:46]

nit: Initialize with NULL.

[mtomasz, 2014/07/08 01:52:09]

Done.

+    ASSERT_TRUE(extensions->GetDictionary(kExtensionId, &file_systems));
+    EXPECT_EQ(1u, file_systems->size());
+  }
+
+  {
+    const bool unmount_result = service_->UnmountFileSystem(
+        kExtensionId, kFileSystemId, Service::UNMOUNT_REASON_SHUTDOWN);
+    EXPECT_TRUE(unmount_result);
+
+    const base::DictionaryValue* const extensions =
+        pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
+    ASSERT_TRUE(extensions);
+
+    const base::DictionaryValue* file_systems;
+    ASSERT_TRUE(extensions->GetDictionary(kExtensionId, &file_systems));
+    EXPECT_EQ(1u, file_systems->size());
+  }
+
+  service_->RemoveObserver(&observer);
+}
+
+TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnUnmountByUser) {
+  LoggingObserver observer;
+  service_->AddObserver(&observer);
+
+  TestingPrefServiceSyncable* const pref_service =
+      profile_->GetTestingPrefService();
+  ASSERT_TRUE(pref_service);
+
+  {
+    const bool mount_result =
+        service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
+    EXPECT_TRUE(mount_result);
+    ASSERT_EQ(1u, observer.mounts.size());
+
+    const base::DictionaryValue* extensions =
+        pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
+    ASSERT_TRUE(extensions);
+
+    const base::DictionaryValue* file_systems;
+    ASSERT_TRUE(extensions->GetDictionary(kExtensionId, &file_systems));
+    EXPECT_EQ(1u, file_systems->size());
+  }
+
+  {
+    const bool unmount_result = service_->UnmountFileSystem(
+        kExtensionId, kFileSystemId, Service::UNMOUNT_REASON_USER);
+    EXPECT_TRUE(unmount_result);
+
+    const base::DictionaryValue* const extensions =
+        pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
+    ASSERT_TRUE(extensions);
+
+    const base::DictionaryValue* file_systems;
+    EXPECT_FALSE(extensions->GetDictionary(kExtensionId, &file_systems));
+  }
+
+  service_->RemoveObserver(&observer);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos