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 f002b55d4e23d22460f6675b22cc6e6ab01683d9..108bae2f6c89781bdc60d13a3ff9e07b6536399a 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/observer.h" |
#include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h" |
@@ -13,6 +14,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" |
@@ -63,6 +67,21 @@ class LoggingObserver : public Observer { |
std::vector<Event> unmounts; |
}; |
+// Creates a fake extension with the specified |extension_id|. |
+scoped_refptr<extensions::Extension> createFakeExtension( |
hashimoto
2014/03/27 09:18:49
Hmm, it's generally better to return raw-pointer t
mtomasz
2014/03/28 06:01:10
I think in this case, there is no other choice. If
|
+ 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, |
+ &error); |
+} |
+ |
} // namespace |
class FileSystemProviderServiceTest : public testing::Test { |
@@ -71,11 +90,14 @@ 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())); |
+ user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_)); |
+ extension_registry_.reset(new extensions::ExtensionRegistry); |
+ file_system_provider_service_.reset( |
+ new Service(profile_.get(), extension_registry_.get())); |
+ extension_ = createFakeExtension(kExtensionId); |
} |
virtual void TearDown() { |
@@ -84,9 +106,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) { |
@@ -200,6 +224,37 @@ 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()); |
+ EXPECT_EQ( |
+ "/provided/mbflcebpggnecokmikipoihdbecnjfoj-1-testing_profile-hash", |
hashimoto
2014/03/27 09:18:49
This EXPECT looks fragile for changes in UserManag
mtomasz
2014/03/28 06:01:10
I was thinking about it, but I was concerned that
|
+ 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); |