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

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

Issue 13448003: Narrow the ownership of DriveUploader from DriveSystemService to DriveScheduler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 9 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 87b93840f2295c24ad5b1e9074415650f6b0e40d..61bcbbc1824efbcea5a34923c9361057937ed63a 100644
--- a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
@@ -27,7 +27,6 @@
#include "chrome/browser/chromeos/drive/mock_directory_change_observer.h"
#include "chrome/browser/chromeos/drive/mock_drive_cache_observer.h"
#include "chrome/browser/google_apis/drive_api_parser.h"
-#include "chrome/browser/google_apis/drive_uploader.h"
#include "chrome/browser/google_apis/fake_drive_service.h"
#include "chrome/browser/google_apis/test_util.h"
#include "chrome/common/chrome_paths.h"
@@ -127,7 +126,6 @@ class DriveFileSystemTest : public testing::Test {
blocking_task_runner_,
fake_free_disk_space_getter_.get()));
- uploader_.reset(new google_apis::DriveUploader(fake_drive_service_.get()));
drive_webapps_registry_.reset(new DriveWebAppsRegistry);
@@ -151,7 +149,6 @@ class DriveFileSystemTest : public testing::Test {
file_system_.reset(new DriveFileSystem(profile_.get(),
cache_.get(),
fake_drive_service_.get(),
- uploader_.get(),
drive_webapps_registry_.get(),
resource_metadata_.get(),
blocking_task_runner_));
@@ -450,7 +447,6 @@ class DriveFileSystemTest : public testing::Test {
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
scoped_ptr<TestingProfile> profile_;
scoped_ptr<DriveCache, test_util::DestroyHelperForTests> cache_;
- scoped_ptr<google_apis::DriveUploaderInterface> uploader_;
scoped_ptr<DriveFileSystem> file_system_;
scoped_ptr<google_apis::FakeDriveService> fake_drive_service_;
scoped_ptr<DriveWebAppsRegistry> drive_webapps_registry_;
« 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