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

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

BUG=240165
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=237552

[keishi, 2013-11-26 06:50:11]

I can still separate out the set_used_network(true) part if you want.it wasn't
so big so I uploaded whole for review.

[tzik, 2013-11-26 07:09:08]

Thanks! Looks good overall.
But, I think it's more readable to move each set_used_network calls just before
drive_service()->Foo().

[keishi, 2013-11-26 07:48:09]

On 2013/11/26 07:09:08, tzik wrote:
> Thanks! Looks good overall.
> But, I think it's more readable to move each set_used_network calls just
before
> drive_service()->Foo().

Done.

[tzik, 2013-11-26 08:26:19]

lgtm

https://codereview.chromium.org/87463002/diff/10001/chrome/browser/sync_file_...
File chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
(right):

https://codereview.chromium.org/87463002/diff/10001/chrome/browser/sync_file_...
chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc:48:
base::WeakPtrFactory<MockSyncTask> weak_ptr_factory_;
Is this not used?

[keishi, 2013-11-26 08:33:46]

https://codereview.chromium.org/87463002/diff/10001/chrome/browser/sync_file_...
File chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
(right):

https://codereview.chromium.org/87463002/diff/10001/chrome/browser/sync_file_...
chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc:48:
base::WeakPtrFactory<MockSyncTask> weak_ptr_factory_;
On 2013/11/26 08:26:19, tzik wrote:
> Is this not used?

Sorry. Removed.

[commit-bot: I haz the power, 2013-11-26 08:35:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/keishi@chromium.org/87463002/20001

[commit-bot: I haz the power, 2013-11-26 08:45:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/keishi@chromium.org/87463002/50001

[commit-bot: I haz the power, 2013-11-26 09:18:55]

Retried try job too often on mac_rel for step(s) telemetry_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2013-11-26 09:25:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/keishi@chromium.org/87463002/50001

[commit-bot: I haz the power, 2013-11-26 12:05:17]

Failed to apply patch for
chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
  Hunk #1 succeeded at 268 (offset 43 lines).
  Hunk #2 succeeded at 321 (offset 43 lines).
  Hunk #3 succeeded at 353 (offset 43 lines).
  Hunk #4 FAILED at 365.
  1 out of 4 hunks FAILED -- saving rejects to file
chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc.rej

Patch:      
chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
Index: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
diff --git
a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
index
4746acfbb7ad5464462f143743700101e8d76870..4d319f47a3634eef120523d8a503522c60e4b99b
100644
--- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
+++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
@@ -225,6 +225,7 @@ void LocalToRemoteSyncer::DeleteRemoteFile(
   DCHECK(remote_file_tracker_);
   DCHECK(remote_file_tracker_->has_synced_details());
 
+  set_used_network(true);
   drive_service()->DeleteResource(
       remote_file_tracker_->file_id(),
       remote_file_tracker_->synced_details().etag(),
@@ -277,6 +278,7 @@ void LocalToRemoteSyncer::DidGetMD5ForUpload(
     return;
   }
 
+  set_used_network(true);
   drive_uploader()->UploadExistingFile(
       remote_file_tracker_->file_id(),
       local_path_,
@@ -308,6 +310,7 @@ void LocalToRemoteSyncer::DidUploadExistingFile(
 void LocalToRemoteSyncer::UpdateRemoteMetadata(
     const SyncStatusCallback& callback) {
   DCHECK(remote_file_tracker_);
+  set_used_network(true);
   drive_service()->GetResourceEntry(
       remote_file_tracker_->file_id(),
       base::Bind(&LocalToRemoteSyncer::DidGetRemoteMetadata,
@@ -362,6 +365,7 @@ void LocalToRemoteSyncer::DidDeleteForCreateFolder(
 void LocalToRemoteSyncer::UploadNewFile(const SyncStatusCallback& callback) {
   DCHECK(remote_parent_folder_tracker_);
 
+  set_used_network(true);
   base::FilePath title = fileapi::VirtualPath::BaseName(url_.path());
   drive_uploader()->UploadNewFile(
       remote_parent_folder_tracker_->file_id(),

[commit-bot: I haz the power, 2013-11-27 08:17:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/keishi@chromium.org/87463002/70001

[tzik, 2013-11-27 09:12:55]

BUG= looks broken.. Please update it.

[commit-bot: I haz the power, 2013-11-27 09:19:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/keishi@chromium.org/87463002/70001

[commit-bot: I haz the power, 2013-11-27 10:22:11]

Change committed as 237552