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

Unified Diff: chrome/browser/chromeos/drive/drive_file_system_unittest.cc

Issue 14118006: Change owner of DriveScheduler from DriveFileSystem to DriveSystemService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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
« no previous file with comments | « chrome/browser/chromeos/drive/drive_file_system.cc ('k') | chrome/browser/chromeos/drive/drive_scheduler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/drive_file_system_unittest.cc
diff --git a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
index 75e8a17237a1162c2be8f361978bb66fe53b441c..c711edd181bc0e44c65601c58b56c442734c387b 100644
--- a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
@@ -19,6 +19,7 @@
#include "base/values.h"
#include "chrome/browser/chromeos/drive/drive.pb.h"
#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_scheduler.h"
#include "chrome/browser/chromeos/drive/drive_test_util.h"
#include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
#include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
@@ -133,6 +134,9 @@ class DriveFileSystemTest : public testing::Test {
fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
+ scheduler_.reset(new DriveScheduler(profile_.get(),
+ fake_drive_service_.get()));
+
scoped_refptr<base::SequencedWorkerPool> pool =
content::BrowserThread::GetBlockingPool();
blocking_task_runner_ =
@@ -163,6 +167,7 @@ class DriveFileSystemTest : public testing::Test {
file_system_.reset(new DriveFileSystem(profile_.get(),
cache_.get(),
fake_drive_service_.get(),
+ scheduler_.get(),
drive_webapps_registry_.get(),
resource_metadata_.get(),
blocking_task_runner_));
@@ -179,6 +184,7 @@ class DriveFileSystemTest : public testing::Test {
virtual void TearDown() OVERRIDE {
ASSERT_TRUE(file_system_);
file_system_.reset();
+ scheduler_.reset();
fake_drive_service_.reset();
cache_.reset();
profile_.reset(NULL);
@@ -461,6 +467,7 @@ class DriveFileSystemTest : public testing::Test {
scoped_ptr<DriveCache, test_util::DestroyHelperForTests> cache_;
scoped_ptr<DriveFileSystem> file_system_;
scoped_ptr<google_apis::FakeDriveService> fake_drive_service_;
+ scoped_ptr<DriveScheduler> scheduler_;
scoped_ptr<DriveWebAppsRegistry> drive_webapps_registry_;
scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
resource_metadata_;
« no previous file with comments | « chrome/browser/chromeos/drive/drive_file_system.cc ('k') | chrome/browser/chromeos/drive/drive_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698