[fsp] Unmount file systems when the providing extension gets unloaded.

chrome/browser/chromeos/file_system_provider/service_unittest.cc

Index: chrome/browser/chromeos/file_system_provider/service_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/service_unittest.cc b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
index a24dd236db5def565ae132ccfa67d4a4f61c5573..b26195e772a92d33e4cf15e5ef7dffe55d207fb8 100644
--- a/chrome/browser/chromeos/file_system_provider/service_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
@@ -6,6 +6,7 @@
 #include <vector>
 
 #include "base/files/file.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h"
 #include "chrome/browser/chromeos/file_system_provider/mount_path_util.h"
@@ -15,6 +16,9 @@
 #include "chrome/browser/chromeos/login/fake_user_manager.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "extensions/browser/extension_registry.h"
+#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"
 
@@ -65,6 +69,21 @@ class LoggingObserver : public Observer {
   std::vector<Event> unmounts;
 };
 
+// Creates a fake extension with the specified |extension_id|.
+scoped_refptr<extensions::Extension> createFakeExtension(
+    const std::string& extension_id) {
+  base::DictionaryValue manifest;
+  std::string error;
+  manifest.SetString(extensions::manifest_keys::kVersion, "1.0.0.0");
+  manifest.SetString(extensions::manifest_keys::kName, "unused");
+  return extensions::Extension::Create(base::FilePath(),
+                                       extensions::Manifest::UNPACKED,
+                                       manifest,
+                                       extensions::Extension::NO_FLAGS,
+                                       kExtensionId,

[hashimoto, 2014/04/18 05:35:15]

This should be extension_id?

[mtomasz, 2014/04/18 06:01:34]

Good catch! Done.

+                                       &error);
+}
+
 }  // namespace
 
 class FileSystemProviderServiceTest : public testing::Test {
@@ -73,13 +92,15 @@ class FileSystemProviderServiceTest : public testing::Test {
   virtual ~FileSystemProviderServiceTest() {}
 
   virtual void SetUp() OVERRIDE {
-    user_manager_ = new FakeUserManager();
-    user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_));
     profile_.reset(new TestingProfile);
+    user_manager_ = new FakeUserManager();
     user_manager_->AddUser(profile_->GetProfileName());
-    file_system_provider_service_.reset(new Service(profile_.get()));
-    file_system_provider_service_->SetFileSystemFactoryForTests(
-        base::Bind(&FakeProvidedFileSystem::Create));
+    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()));
+    extension_ = createFakeExtension(kExtensionId);
   }
 
   virtual void TearDown() {
@@ -88,9 +109,11 @@ class FileSystemProviderServiceTest : public testing::Test {
 
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfile> profile_;
-  scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
   FakeUserManager* user_manager_;
+  scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
+  scoped_ptr<extensions::ExtensionRegistry> extension_registry_;
   scoped_ptr<Service> file_system_provider_service_;
+  scoped_refptr<extensions::Extension> extension_;
 };
 
 TEST_F(FileSystemProviderServiceTest, MountFileSystem) {
@@ -205,6 +228,39 @@ TEST_F(FileSystemProviderServiceTest, UnmountFileSystem) {
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
+TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_OnExtensionUnload) {
+  LoggingObserver observer;
+  file_system_provider_service_->AddObserver(&observer);
+
+  int file_system_id = file_system_provider_service_->MountFileSystem(
+      kExtensionId, kFileSystemName);
+  EXPECT_LT(0, file_system_id);
+  ASSERT_EQ(1u, observer.mounts.size());
+
+  // Directly call the observer's method.
+  file_system_provider_service_->OnExtensionUnloaded(extension_.get());
+
+  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(1, observer.unmounts[0].file_system_info().file_system_id());
+  base::FilePath expected_mount_path =
+      util::GetMountPointPath(profile_.get(), kExtensionId, file_system_id);
+  EXPECT_EQ(
+      expected_mount_path.AsUTF8Unsafe(),
+      observer.unmounts[0].file_system_info().mount_path().AsUTF8Unsafe());
+  EXPECT_EQ(kFileSystemName,
+            observer.unmounts[0].file_system_info().file_system_name());
+
+  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_WrongExtensionId) {
   LoggingObserver observer;
   file_system_provider_service_->AddObserver(&observer);