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

chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.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/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/drive/drive_uploader.h"
@@ skipping 15 matching lines @@
 
 const char kAppID[] = "app_id";
 
 void EmptyTask(SyncStatusCode status, const SyncStatusCallback& callback) {
   base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, status));
 }
 
 }  // 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() {}
   virtual ~MockExtensionService() {}
 
   virtual const ExtensionSet* extensions() const OVERRIDE {
     return &extensions_;
   }
 
   virtual const ExtensionSet* disabled_extensions() const OVERRIDE {
@@ skipping 202 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(SYNC_STATUS_OK, sync_status);
 
   sync_engine()->GetOriginStatusMap(&status_map);
   ASSERT_EQ(2u, status_map.size());
   EXPECT_EQ("Enabled", status_map[GURL("chrome-extension://app_0")]);
   EXPECT_EQ("Disabled", status_map[GURL("chrome-extension://app_1")]);
 }
 
 TEST_F(SyncEngineTest, UpdateServiceState) {
-  //SyncStatusCode sync_status = SYNC_STATUS_UNKNOWN;
-
   EXPECT_EQ(REMOTE_SERVICE_OK, sync_engine()->GetCurrentState());
 
   GetSyncEngineTaskManager()->ScheduleTask(
       base::Bind(&EmptyTask, SYNC_STATUS_AUTHENTICATION_FAILED),
       base::Bind(&SyncEngineTest::CheckServiceState,
                  AsWeakPtr(),
                  SYNC_STATUS_AUTHENTICATION_FAILED,
                  REMOTE_SERVICE_AUTHENTICATION_REQUIRED));
 
   GetSyncEngineTaskManager()->ScheduleTask(
@@ skipping 45 matching lines @@
                  SYNC_DATABASE_ERROR_IO_ERROR,
                  REMOTE_SERVICE_DISABLED));
 
   GetSyncEngineTaskManager()->ScheduleTask(
       base::Bind(&EmptyTask, SYNC_DATABASE_ERROR_FAILED),
       base::Bind(&SyncEngineTest::CheckServiceState,
                  AsWeakPtr(),
                  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();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system