Only re-enable remote service if the task used the network.

chrome/browser/sync_file_system/drive_backend/sync_engine.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chrome/browser/drive/drive_notification_manager.h"
 #include "chrome/browser/drive/drive_service_interface.h"
@@ skipping 232 matching lines @@
   if (GetCurrentState() == REMOTE_SERVICE_DISABLED)
     return;
 
   // TODO(tzik): Notify observer of OnRemoteChangeQueueUpdated.
   // TODO(tzik): Add an interface to get the number of dirty trackers to
   // MetadataDatabase.
 
   MaybeStartFetchChanges();
 }
 
-void SyncEngine::NotifyLastOperationStatus(SyncStatusCode sync_status) {
-  UpdateServiceStateFromSyncStatusCode(sync_status);
+void SyncEngine::NotifyLastOperationStatus(
+    SyncStatusCode sync_status,
+    bool used_network) {
+  UpdateServiceStateFromSyncStatusCode(sync_status, used_network);
 }
 
 void SyncEngine::OnNotificationReceived() {
   should_check_remote_change_ = true;
   MaybeScheduleNextTask();
 }
 
 void SyncEngine::OnPushNotificationEnabled(bool enabled) {}
 
 void SyncEngine::OnReadyToSendRequests() {
@@ skipping 93 matching lines @@
     return;
 
   if (task_manager_->ScheduleSyncTaskIfIdle(
           scoped_ptr<SyncTask>(new ListChangesTask(this)))) {
     should_check_remote_change_ = false;
     time_to_check_changes_ =
         now + base::TimeDelta::FromSeconds(kListChangesRetryDelaySeconds);
   }
 }
 
-void SyncEngine::UpdateServiceStateFromSyncStatusCode(SyncStatusCode status) {
+void SyncEngine::UpdateServiceStateFromSyncStatusCode(
+      SyncStatusCode status,
+      bool used_network) {
   switch (status) {
     case SYNC_STATUS_OK:
-      // FIXME(keishi) Do not turn remote service back on if the task did not
-      // involve network access.
-      UpdateServiceState(REMOTE_SERVICE_OK, std::string());
+      if (used_network)
+        UpdateServiceState(REMOTE_SERVICE_OK, std::string());
       break;
 
     // Authentication error.
     case SYNC_STATUS_AUTHENTICATION_FAILED:
       UpdateServiceState(REMOTE_SERVICE_AUTHENTICATION_REQUIRED,
                          "Authentication required");
       break;
 
     // OAuth token error.
     case SYNC_STATUS_ACCESS_FORBIDDEN:
@@ skipping 72 matching lines @@
         tracker.tracker_kind() == TRACKER_KIND_APP_ROOT;
     if (is_app_enabled && !is_app_root_tracker_enabled)
       EnableOrigin(origin, base::Bind(&EmptyStatusCallback));
     else if (!is_app_enabled && is_app_root_tracker_enabled)
       DisableOrigin(origin, base::Bind(&EmptyStatusCallback));
   }
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system