Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / drive_backend / sync_worker_unittest.cc

diff --git a/src/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc b/src/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc
index 7fec59b..ee98464 100644 (file)
--- a/src/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc
+++ b/src/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc
@@ -45,9 +45,9 @@ class MockSyncTask : public ExclusiveTask {
   explicit MockSyncTask(bool used_network) {
     set_used_network(used_network);
   }
-  virtual ~MockSyncTask() {}
+  ~MockSyncTask() override {}
 
-  virtual void RunExclusive(const SyncStatusCallback& callback) OVERRIDE {
+  void RunExclusive(const SyncStatusCallback& callback) override {
     callback.Run(SYNC_STATUS_OK);
   }
 
@@ -58,23 +58,22 @@ class MockSyncTask : public ExclusiveTask {
 class MockExtensionService : public TestExtensionService {
  public:
   MockExtensionService() {}
-  virtual ~MockExtensionService() {}
+  ~MockExtensionService() override {}
 
-  virtual const extensions::ExtensionSet* extensions() const OVERRIDE {
+  const extensions::ExtensionSet* extensions() const override {
     return &extensions_;
   }
 
-  virtual void AddExtension(const extensions::Extension* extension) OVERRIDE {
+  void AddExtension(const extensions::Extension* extension) override {
     extensions_.Insert(make_scoped_refptr(extension));
   }
 
-  virtual const extensions::Extension* GetInstalledExtension(
-      const std::string& extension_id) const OVERRIDE {
+  const extensions::Extension* GetInstalledExtension(
+      const std::string& extension_id) const override {
     return extensions_.GetByID(extension_id);
   }
 
-  virtual bool IsExtensionEnabled(
-      const std::string& extension_id) const OVERRIDE {
+  bool IsExtensionEnabled(const std::string& extension_id) const override {
     return extensions_.Contains(extension_id) &&
         !disabled_extensions_.Contains(extension_id);
   }
@@ -102,9 +101,9 @@ class SyncWorkerTest : public testing::Test,
                        public base::SupportsWeakPtr<SyncWorkerTest> {
  public:
   SyncWorkerTest() {}
-  virtual ~SyncWorkerTest() {}
+  ~SyncWorkerTest() override {}
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ASSERT_TRUE(profile_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
@@ -115,8 +114,8 @@ class SyncWorkerTest : public testing::Test,
     scoped_ptr<SyncEngineContext>
         sync_engine_context(new SyncEngineContext(
             fake_drive_service.Pass(),
-            scoped_ptr<drive::DriveUploaderInterface>(),
-            NULL /* task_logger */,
+            nullptr /* drive_uploader */,
+            nullptr /* task_logger */,
             base::ThreadTaskRunnerHandle::Get() /* ui_task_runner */,
             base::ThreadTaskRunnerHandle::Get() /* worker_task_runner */));
 
@@ -130,7 +129,7 @@ class SyncWorkerTest : public testing::Test,
     base::RunLoop().RunUntilIdle();
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     sync_worker_.reset();
     extension_service_.reset();
     base::RunLoop().RunUntilIdle();