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

Unified Diff: chrome/browser/sync_file_system/drive_backend/list_changes_task.cc

Issue 99383004: [SyncFS] Refine network error handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: buildfix Created 7 years 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
Index: chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc b/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
index 9a35a93cb345eafeae1f6223cba3351d0b7f77ff..535f4efc01fdf5a9fb1fed02f64ba96cd93831ec 100644
--- a/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
+++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
#include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
#include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
+#include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h"
#include "chrome/browser/sync_file_system/logger.h"
#include "chrome/browser/sync_file_system/syncable_file_system_util.h"
#include "google_apis/drive/drive_api_parser.h"
@@ -60,12 +61,19 @@ void ListChangesTask::DidListChanges(
const SyncStatusCallback& callback,
google_apis::GDataErrorCode error,
scoped_ptr<google_apis::ResourceList> resource_list) {
- if (error != google_apis::HTTP_SUCCESS) {
+ SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
+ if (status != SYNC_STATUS_OK) {
util::Log(logging::LOG_ERROR, FROM_HERE, "Failed to fetch change list.");
callback.Run(SYNC_STATUS_NETWORK_ERROR);
return;
}
+ if (!resource_list) {
+ NOTREACHED();
+ callback.Run(SYNC_STATUS_FAILED);
+ return;
+ }
+
change_list_.reserve(change_list_.size() + resource_list->entries().size());
for (size_t i = 0; i < resource_list->entries().size(); ++i) {
change_list_.push_back(ConvertResourceEntryToChangeResource(

Powered by Google App Engine
This is Rietveld 408576698