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

Side by Side Diff: chrome/browser/chromeos/drive/file_system/operation_test_base.cc

Issue 372713004: Wait for parent directory sync before performing server-side copy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add operation_observer.cc Created 6 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/chromeos/drive/file_system/operation_test_base.h" 5 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
6 6
7 #include "base/prefs/testing_pref_service.h" 7 #include "base/prefs/testing_pref_service.h"
8 #include "base/threading/sequenced_worker_pool.h" 8 #include "base/threading/sequenced_worker_pool.h"
9 #include "chrome/browser/chromeos/drive/change_list_loader.h" 9 #include "chrome/browser/chromeos/drive/change_list_loader.h"
10 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" 10 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
(...skipping 26 matching lines...) Expand all
37 void OperationTestBase::LoggingObserver::OnEntryUpdatedByOperation( 37 void OperationTestBase::LoggingObserver::OnEntryUpdatedByOperation(
38 const std::string& local_id) { 38 const std::string& local_id) {
39 updated_local_ids_.insert(local_id); 39 updated_local_ids_.insert(local_id);
40 } 40 }
41 41
42 void OperationTestBase::LoggingObserver::OnDriveSyncError( 42 void OperationTestBase::LoggingObserver::OnDriveSyncError(
43 DriveSyncErrorType type, const std::string& local_id) { 43 DriveSyncErrorType type, const std::string& local_id) {
44 drive_sync_errors_.push_back(type); 44 drive_sync_errors_.push_back(type);
45 } 45 }
46 46
47 bool OperationTestBase::LoggingObserver::WaitForSyncComplete(
48 const std::string& local_id,
49 const FileOperationCallback& callback) {
50 return wait_for_sync_complete_handler_.is_null() ?
51 false : wait_for_sync_complete_handler_.Run(local_id, callback);
52 }
53
47 OperationTestBase::OperationTestBase() { 54 OperationTestBase::OperationTestBase() {
48 } 55 }
49 56
50 OperationTestBase::OperationTestBase(int test_thread_bundle_options) 57 OperationTestBase::OperationTestBase(int test_thread_bundle_options)
51 : thread_bundle_(test_thread_bundle_options) { 58 : thread_bundle_(test_thread_bundle_options) {
52 } 59 }
53 60
54 OperationTestBase::~OperationTestBase() { 61 OperationTestBase::~OperationTestBase() {
55 } 62 }
56 63
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 FileError OperationTestBase::CheckForUpdates() { 185 FileError OperationTestBase::CheckForUpdates() {
179 FileError error = FILE_ERROR_FAILED; 186 FileError error = FILE_ERROR_FAILED;
180 change_list_loader_->CheckForUpdates( 187 change_list_loader_->CheckForUpdates(
181 google_apis::test_util::CreateCopyResultCallback(&error)); 188 google_apis::test_util::CreateCopyResultCallback(&error));
182 content::RunAllBlockingPoolTasksUntilIdle(); 189 content::RunAllBlockingPoolTasksUntilIdle();
183 return error; 190 return error;
184 } 191 }
185 192
186 } // namespace file_system 193 } // namespace file_system
187 } // namespace drive 194 } // namespace drive
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/drive/file_system/operation_test_base.h ('k') | chrome/browser/chromeos/drive/sync_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698