Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / prefs / tracked / segregated_pref_store_unittest.cc

diff --git a/src/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc b/src/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc
index a7f582d..27b45d7 100644 (file)
--- a/src/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc
+++ b/src/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc
@@ -42,7 +42,7 @@ class MockReadErrorDelegate : public PersistentPrefStore::ReadErrorDelegate {
   }
 
   // PersistentPrefStore::ReadErrorDelegate implementation
-  virtual void OnError(PersistentPrefStore::PrefReadError read_error) OVERRIDE {
+  void OnError(PersistentPrefStore::PrefReadError read_error) override {
     EXPECT_FALSE(data_->invoked);
     data_->invoked = true;
     data_->read_error = read_error;
@@ -62,7 +62,7 @@ class SegregatedPrefStoreTest : public testing::Test {
         read_error_delegate_(
             new MockReadErrorDelegate(&read_error_delegate_data_)) {}
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     selected_store_ = new TestingPrefStore;
     default_store_ = new TestingPrefStore;
 
@@ -77,15 +77,12 @@ class SegregatedPrefStoreTest : public testing::Test {
     segregated_store_->AddObserver(&observer_);
   }
 
-  virtual void TearDown() OVERRIDE {
-    segregated_store_->RemoveObserver(&observer_);
-  }
+  void TearDown() override { segregated_store_->RemoveObserver(&observer_); }
 
  protected:
   scoped_ptr<PersistentPrefStore::ReadErrorDelegate> GetReadErrorDelegate() {
     EXPECT_TRUE(read_error_delegate_);
-    return read_error_delegate_
-        .PassAs<PersistentPrefStore::ReadErrorDelegate>();
+    return read_error_delegate_.Pass();
   }
 
   PrefStoreObserverMock observer_;