Update To 11.40.268.0

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

diff --git a/src/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc b/src/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
index 209a404..fbdc33c 100644 (file)
--- a/src/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
+++ b/src/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
@@ -43,9 +43,9 @@ class SyncEngineInitializerTest : public testing::Test {
   };
 
   SyncEngineInitializerTest() {}
-  virtual ~SyncEngineInitializerTest() {}
+  ~SyncEngineInitializerTest() override {}
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
@@ -55,7 +55,7 @@ class SyncEngineInitializerTest : public testing::Test {
     sync_context_.reset(new SyncEngineContext(
         fake_drive_service.Pass(),
         scoped_ptr<drive::DriveUploaderInterface>(),
-        NULL,
+        nullptr,
         base::ThreadTaskRunnerHandle::Get(),
         base::ThreadTaskRunnerHandle::Get()));
 
@@ -66,7 +66,7 @@ class SyncEngineInitializerTest : public testing::Test {
     sync_task_manager_->Initialize(SYNC_STATUS_OK);
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     sync_task_manager_.reset();
     metadata_database_.reset();
     sync_context_.reset();