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

Side by Side Diff: chrome/browser/chromeos/drive/stale_cache_files_remover_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, 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/drive/search_metadata_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 resource_metadata_.reset(new DriveResourceMetadata( 83 resource_metadata_.reset(new DriveResourceMetadata(
84 fake_drive_service_->GetRootResourceId(), 84 fake_drive_service_->GetRootResourceId(),
85 cache_->GetCacheDirectoryPath(DriveCache::CACHE_TYPE_META), 85 cache_->GetCacheDirectoryPath(DriveCache::CACHE_TYPE_META),
86 blocking_task_runner_)); 86 blocking_task_runner_));
87 87
88 ASSERT_FALSE(file_system_); 88 ASSERT_FALSE(file_system_);
89 file_system_ = new DriveFileSystem(profile_.get(), 89 file_system_ = new DriveFileSystem(profile_.get(),
90 cache_.get(), 90 cache_.get(),
91 fake_drive_service_.get(), 91 fake_drive_service_.get(),
92 NULL, // drive_uploader
93 drive_webapps_registry_.get(), 92 drive_webapps_registry_.get(),
94 resource_metadata_.get(), 93 resource_metadata_.get(),
95 blocking_task_runner_); 94 blocking_task_runner_);
96 95
97 mock_cache_observer_.reset(new StrictMock<MockDriveCacheObserver>); 96 mock_cache_observer_.reset(new StrictMock<MockDriveCacheObserver>);
98 cache_->AddObserver(mock_cache_observer_.get()); 97 cache_->AddObserver(mock_cache_observer_.get());
99 98
100 mock_directory_observer_.reset(new StrictMock<MockDirectoryChangeObserver>); 99 mock_directory_observer_.reset(new StrictMock<MockDirectoryChangeObserver>);
101 file_system_->AddObserver(mock_directory_observer_.get()); 100 file_system_->AddObserver(mock_directory_observer_.get());
102 101
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 186
188 // Verify that the cache entry is deleted. 187 // Verify that the cache entry is deleted.
189 cache_->GetCacheEntry(resource_id, md5, 188 cache_->GetCacheEntry(resource_id, md5,
190 google_apis::test_util::CreateCopyResultCallback( 189 google_apis::test_util::CreateCopyResultCallback(
191 &success, &cache_entry)); 190 &success, &cache_entry));
192 google_apis::test_util::RunBlockingPoolTask(); 191 google_apis::test_util::RunBlockingPoolTask();
193 EXPECT_FALSE(success); 192 EXPECT_FALSE(success);
194 } 193 }
195 194
196 } // namespace drive 195 } // namespace drive
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/drive/search_metadata_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698