Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / local / local_file_sync_service_unittest.cc

diff --git a/src/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc b/src/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc
index 57a3e8e..67c7088 100644 (file)
--- a/src/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc
+++ b/src/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc
@@ -109,7 +109,7 @@ class LocalFileSyncServiceTest
                        content::TestBrowserThreadBundle::REAL_IO_THREAD),
         num_changes_(0) {}
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
@@ -139,7 +139,7 @@ class LocalFileSyncServiceTest
         set_mock_notify_changes_duration_in_sec(0);
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     local_service_->Shutdown();
     file_system_->TearDown();
     RevokeSyncableFileSystem();
@@ -148,7 +148,7 @@ class LocalFileSyncServiceTest
   }
 
   // LocalChangeObserver overrides.
-  virtual void OnLocalChangeAvailable(int64 num_changes) OVERRIDE {
+  void OnLocalChangeAvailable(int64 num_changes) override {
     num_changes_ = num_changes;
   }
 
@@ -591,7 +591,7 @@ TEST_F(LocalFileSyncServiceTest, RecordFakeChange) {
 class OriginChangeMapTest : public testing::Test {
  protected:
   OriginChangeMapTest() {}
-  virtual ~OriginChangeMapTest() {}
+  ~OriginChangeMapTest() override {}
 
   bool NextOriginToProcess(GURL* origin) {
     return map_.NextOriginToProcess(origin);
@@ -630,7 +630,7 @@ TEST_F(OriginChangeMapTest, Basic) {
 
   const GURL kOrigins[] = { kOrigin1, kOrigin2, kOrigin3 };
   std::set<GURL> all_origins;
-  all_origins.insert(kOrigins, kOrigins + ARRAYSIZE_UNSAFE(kOrigins));
+  all_origins.insert(kOrigins, kOrigins + arraysize(kOrigins));
 
   GURL origin;
   while (!all_origins.empty()) {
@@ -667,7 +667,7 @@ TEST_F(OriginChangeMapTest, Basic) {
   SetOriginChangeCount(kOrigin2, 8);
   ASSERT_EQ(1 + 4 + 8, GetTotalChangeCount());
 
-  all_origins.insert(kOrigins, kOrigins + ARRAYSIZE_UNSAFE(kOrigins));
+  all_origins.insert(kOrigins, kOrigins + arraysize(kOrigins));
   while (!all_origins.empty()) {
     ASSERT_TRUE(NextOriginToProcess(&origin));
     ASSERT_TRUE(ContainsKey(all_origins, origin));
@@ -690,7 +690,7 @@ TEST_F(OriginChangeMapTest, WithDisabled) {
   ASSERT_EQ(1 + 2 + 4, GetTotalChangeCount());
 
   std::set<GURL> all_origins;
-  all_origins.insert(kOrigins, kOrigins + ARRAYSIZE_UNSAFE(kOrigins));
+  all_origins.insert(kOrigins, kOrigins + arraysize(kOrigins));
 
   GURL origin;
   while (!all_origins.empty()) {