Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5151)

Unified Diff: chrome/browser/chromeos/file_manager/volume_manager_unittest.cc

Issue 210803003: [fsp] Decouple file_service_provider::Service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
diff --git a/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc b/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
index 828befa48c5c24970a2bcddcdc8aa562c28b0594..1ffdd29a23238a95479b67cd345a3cdae883f96b 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
@@ -11,6 +11,7 @@
#include "base/prefs/pref_service.h"
#include "chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h"
#include "chrome/browser/chromeos/file_manager/volume_manager_observer.h"
+#include "chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h"
#include "chrome/browser/chromeos/file_system_provider/service.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
@@ -145,14 +146,18 @@ class VolumeManagerTest : public testing::Test {
chromeos::disks::DiskMountManager* disk_manager)
: profile_(new TestingProfile),
file_system_provider_service_(
- new chromeos::file_system_provider::Service(profile_.get())),
- volume_manager_(new VolumeManager(
- profile_.get(),
- NULL, // DriveIntegrationService
- power_manager_client,
- disk_manager,
- file_system_provider_service_.get())) {
- }
+ chromeos::file_system_provider::Service::CreateForTesting(
+ profile_.get(),
+ scoped_ptr<chromeos::file_system_provider::
+ ProvidedFileSystemFactoryInterface>(
+ new chromeos::file_system_provider::
+ FakeProvidedFileSystemFactory))),
+ volume_manager_(
+ new VolumeManager(profile_.get(),
+ NULL, // DriveIntegrationService
+ power_manager_client,
+ disk_manager,
+ file_system_provider_service_.get())) {}
Profile* profile() const { return profile_.get(); }
VolumeManager* volume_manager() const { return volume_manager_.get(); }

Powered by Google App Engine
This is Rietveld 408576698