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

chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc

Index: chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
index 4bc8ebd02e5485c3167383c3b9b0bcef2de1e7d2..6a66bee7cbfb7c88a0c2f1195f002079bd83bcc2 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
@@ -33,6 +33,23 @@ void EmptyTask(SyncStatusCode status, const SyncStatusCallback& callback) {
 
 }  // namespace
 
+class MockSyncTask : public SyncTask {
+ public:
+  explicit MockSyncTask(bool used_network) : weak_ptr_factory_(this) {
+    set_used_network(used_network);
+  }
+  virtual ~MockSyncTask() {}
+
+  virtual void Run(const SyncStatusCallback& callback) OVERRIDE {
+    callback.Run(SYNC_STATUS_OK);
+  }
+
+ private:
+  base::WeakPtrFactory<MockSyncTask> weak_ptr_factory_;

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

Is this not used?

[keishi, 2013/11/26 08:33:47]

Sorry. Removed.

+
+  DISALLOW_COPY_AND_ASSIGN(MockSyncTask);
+};
+
 class MockExtensionService : public TestExtensionService {
  public:
   MockExtensionService() {}
@@ -255,8 +272,6 @@ TEST_F(SyncEngineTest, GetOriginStatusMap) {
 }
 
 TEST_F(SyncEngineTest, UpdateServiceState) {
-  //SyncStatusCode sync_status = SYNC_STATUS_UNKNOWN;
-
   EXPECT_EQ(REMOTE_SERVICE_OK, sync_engine()->GetCurrentState());
 
   GetSyncEngineTaskManager()->ScheduleTask(
@@ -322,6 +337,20 @@ TEST_F(SyncEngineTest, UpdateServiceState) {
                  SYNC_DATABASE_ERROR_FAILED,
                  REMOTE_SERVICE_DISABLED));
 
+  GetSyncEngineTaskManager()->ScheduleSyncTask(
+      scoped_ptr<SyncTask>(new MockSyncTask(false)),
+      base::Bind(&SyncEngineTest::CheckServiceState,
+                 AsWeakPtr(),
+                 SYNC_STATUS_OK,
+                 REMOTE_SERVICE_DISABLED));
+
+  GetSyncEngineTaskManager()->ScheduleSyncTask(
+      scoped_ptr<SyncTask>(new MockSyncTask(true)),
+      base::Bind(&SyncEngineTest::CheckServiceState,
+                 AsWeakPtr(),
+                 SYNC_STATUS_OK,
+                 REMOTE_SERVICE_OK));
+
   base::RunLoop().RunUntilIdle();
 }