diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/sync_file_system/local/sync_file_system_backend.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc b/chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc index bcc4581..8f94bd8 100644 --- a/chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc +++ b/chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc @@ -32,6 +32,10 @@ FileSystemURL CreateFileSystemURL(const std::string& extension, } TEST(ChromeOSFileSystemBackendTest, DefaultMountPoints) { + // Make sure no system-level mount points are registered before testing + // to avoid flakiness. + fileapi::ExternalMountPoints::GetSystemInstance()->RevokeAllFileSystems(); + scoped_refptr<quota::SpecialStoragePolicy> storage_policy = new quota::MockSpecialStoragePolicy(); scoped_refptr<fileapi::ExternalMountPoints> mount_points( diff --git a/chrome/browser/sync_file_system/local/sync_file_system_backend.cc b/chrome/browser/sync_file_system/local/sync_file_system_backend.cc index f85aaa8..b3fee34 100644 --- a/chrome/browser/sync_file_system/local/sync_file_system_backend.cc +++ b/chrome/browser/sync_file_system/local/sync_file_system_backend.cc @@ -72,8 +72,6 @@ SyncFileSystemBackend::SyncFileSystemBackend(Profile* profile) } SyncFileSystemBackend::~SyncFileSystemBackend() { - RevokeSyncableFileSystem(); - if (change_tracker_) { GetDelegate()->file_task_runner()->DeleteSoon( FROM_HERE, change_tracker_.release()); |