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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc

Issue 2871303004: Rename TaskRunner::RunsTasksOnCurrentThread() in //chrome (Closed)
Patch Set: fixed build error Created 3 years, 7 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
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/sync_file_system/drive_backend/local_to_remote_syncer.h " 5 #include "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h "
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 return; 501 return;
502 } 502 }
503 503
504 SyncCompleted(std::move(token), SYNC_STATUS_OK); 504 SyncCompleted(std::move(token), SYNC_STATUS_OK);
505 } 505 }
506 506
507 void LocalToRemoteSyncer::UploadExistingFile( 507 void LocalToRemoteSyncer::UploadExistingFile(
508 std::unique_ptr<SyncTaskToken> token) { 508 std::unique_ptr<SyncTaskToken> token) {
509 DCHECK(remote_file_tracker_); 509 DCHECK(remote_file_tracker_);
510 DCHECK(remote_file_tracker_->has_synced_details()); 510 DCHECK(remote_file_tracker_->has_synced_details());
511 DCHECK(sync_context_->GetWorkerTaskRunner()->RunsTasksOnCurrentThread()); 511 DCHECK(sync_context_->GetWorkerTaskRunner()->RunsTasksInCurrentSequence());
512 512
513 const std::string local_file_md5 = drive::util::GetMd5Digest(local_path_, 513 const std::string local_file_md5 = drive::util::GetMd5Digest(local_path_,
514 nullptr); 514 nullptr);
515 if (local_file_md5 == remote_file_tracker_->synced_details().md5()) { 515 if (local_file_md5 == remote_file_tracker_->synced_details().md5()) {
516 // Local file is not changed. 516 // Local file is not changed.
517 SyncCompleted(std::move(token), SYNC_STATUS_OK); 517 SyncCompleted(std::move(token), SYNC_STATUS_OK);
518 return; 518 return;
519 } 519 }
520 520
521 file_type_ = SYNC_FILE_TYPE_FILE; 521 file_type_ = SYNC_FILE_TYPE_FILE;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 base::Bind(&LocalToRemoteSyncer::DidGetRemoteMetadata, 604 base::Bind(&LocalToRemoteSyncer::DidGetRemoteMetadata,
605 weak_ptr_factory_.GetWeakPtr(), 605 weak_ptr_factory_.GetWeakPtr(),
606 file_id, base::Passed(&token))); 606 file_id, base::Passed(&token)));
607 } 607 }
608 608
609 void LocalToRemoteSyncer::DidGetRemoteMetadata( 609 void LocalToRemoteSyncer::DidGetRemoteMetadata(
610 const std::string& file_id, 610 const std::string& file_id,
611 std::unique_ptr<SyncTaskToken> token, 611 std::unique_ptr<SyncTaskToken> token,
612 google_apis::DriveApiErrorCode error, 612 google_apis::DriveApiErrorCode error,
613 std::unique_ptr<google_apis::FileResource> entry) { 613 std::unique_ptr<google_apis::FileResource> entry) {
614 DCHECK(sync_context_->GetWorkerTaskRunner()->RunsTasksOnCurrentThread()); 614 DCHECK(sync_context_->GetWorkerTaskRunner()->RunsTasksInCurrentSequence());
615 615
616 if (error == google_apis::HTTP_NOT_FOUND) { 616 if (error == google_apis::HTTP_NOT_FOUND) {
617 retry_on_success_ = true; 617 retry_on_success_ = true;
618 SyncStatusCode status = 618 SyncStatusCode status =
619 metadata_database()->UpdateByDeletedRemoteFile(file_id); 619 metadata_database()->UpdateByDeletedRemoteFile(file_id);
620 SyncCompleted(std::move(token), status); 620 SyncCompleted(std::move(token), status);
621 return; 621 return;
622 } 622 }
623 623
624 SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error); 624 SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 set_used_network(true); 762 set_used_network(true);
763 return sync_context_->GetDriveUploader(); 763 return sync_context_->GetDriveUploader();
764 } 764 }
765 765
766 MetadataDatabase* LocalToRemoteSyncer::metadata_database() { 766 MetadataDatabase* LocalToRemoteSyncer::metadata_database() {
767 return sync_context_->GetMetadataDatabase(); 767 return sync_context_->GetMetadataDatabase();
768 } 768 }
769 769
770 } // namespace drive_backend 770 } // namespace drive_backend
771 } // namespace sync_file_system 771 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698