Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(533)

Side by Side Diff: chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/tracked/segregated_pref_store.h" 5 #include "chrome/browser/prefs/tracked/segregated_pref_store.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 24 matching lines...) Expand all
35 bool invoked; 35 bool invoked;
36 PersistentPrefStore::PrefReadError read_error; 36 PersistentPrefStore::PrefReadError read_error;
37 }; 37 };
38 38
39 explicit MockReadErrorDelegate(Data* data) : data_(data) { 39 explicit MockReadErrorDelegate(Data* data) : data_(data) {
40 DCHECK(data_); 40 DCHECK(data_);
41 EXPECT_FALSE(data_->invoked); 41 EXPECT_FALSE(data_->invoked);
42 } 42 }
43 43
44 // PersistentPrefStore::ReadErrorDelegate implementation 44 // PersistentPrefStore::ReadErrorDelegate implementation
45 virtual void OnError(PersistentPrefStore::PrefReadError read_error) OVERRIDE { 45 virtual void OnError(PersistentPrefStore::PrefReadError read_error) override {
46 EXPECT_FALSE(data_->invoked); 46 EXPECT_FALSE(data_->invoked);
47 data_->invoked = true; 47 data_->invoked = true;
48 data_->read_error = read_error; 48 data_->read_error = read_error;
49 } 49 }
50 50
51 private: 51 private:
52 Data* data_; 52 Data* data_;
53 }; 53 };
54 54
55 } // namespace 55 } // namespace
56 56
57 class SegregatedPrefStoreTest : public testing::Test { 57 class SegregatedPrefStoreTest : public testing::Test {
58 public: 58 public:
59 SegregatedPrefStoreTest() 59 SegregatedPrefStoreTest()
60 : read_error_delegate_data_(false, 60 : read_error_delegate_data_(false,
61 PersistentPrefStore::PREF_READ_ERROR_NONE), 61 PersistentPrefStore::PREF_READ_ERROR_NONE),
62 read_error_delegate_( 62 read_error_delegate_(
63 new MockReadErrorDelegate(&read_error_delegate_data_)) {} 63 new MockReadErrorDelegate(&read_error_delegate_data_)) {}
64 64
65 virtual void SetUp() OVERRIDE { 65 virtual void SetUp() override {
66 selected_store_ = new TestingPrefStore; 66 selected_store_ = new TestingPrefStore;
67 default_store_ = new TestingPrefStore; 67 default_store_ = new TestingPrefStore;
68 68
69 std::set<std::string> selected_pref_names; 69 std::set<std::string> selected_pref_names;
70 selected_pref_names.insert(kSelectedPref); 70 selected_pref_names.insert(kSelectedPref);
71 71
72 segregated_store_ = new SegregatedPrefStore( 72 segregated_store_ = new SegregatedPrefStore(
73 default_store_, 73 default_store_,
74 selected_store_, 74 selected_store_,
75 selected_pref_names); 75 selected_pref_names);
76 76
77 segregated_store_->AddObserver(&observer_); 77 segregated_store_->AddObserver(&observer_);
78 } 78 }
79 79
80 virtual void TearDown() OVERRIDE { 80 virtual void TearDown() override {
81 segregated_store_->RemoveObserver(&observer_); 81 segregated_store_->RemoveObserver(&observer_);
82 } 82 }
83 83
84 protected: 84 protected:
85 scoped_ptr<PersistentPrefStore::ReadErrorDelegate> GetReadErrorDelegate() { 85 scoped_ptr<PersistentPrefStore::ReadErrorDelegate> GetReadErrorDelegate() {
86 EXPECT_TRUE(read_error_delegate_); 86 EXPECT_TRUE(read_error_delegate_);
87 return read_error_delegate_ 87 return read_error_delegate_
88 .PassAs<PersistentPrefStore::ReadErrorDelegate>(); 88 .PassAs<PersistentPrefStore::ReadErrorDelegate>();
89 } 89 }
90 90
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 selected_store_->SetBlockAsyncRead(true); 263 selected_store_->SetBlockAsyncRead(true);
264 default_store_->SetBlockAsyncRead(true); 264 default_store_->SetBlockAsyncRead(true);
265 EXPECT_FALSE(segregated_store_->IsInitializationComplete()); 265 EXPECT_FALSE(segregated_store_->IsInitializationComplete());
266 segregated_store_->ReadPrefsAsync(NULL); 266 segregated_store_->ReadPrefsAsync(NULL);
267 EXPECT_FALSE(segregated_store_->IsInitializationComplete()); 267 EXPECT_FALSE(segregated_store_->IsInitializationComplete());
268 selected_store_->SetBlockAsyncRead(false); 268 selected_store_->SetBlockAsyncRead(false);
269 EXPECT_FALSE(segregated_store_->IsInitializationComplete()); 269 EXPECT_FALSE(segregated_store_->IsInitializationComplete());
270 default_store_->SetBlockAsyncRead(false); 270 default_store_->SetBlockAsyncRead(false);
271 EXPECT_TRUE(segregated_store_->IsInitializationComplete()); 271 EXPECT_TRUE(segregated_store_->IsInitializationComplete());
272 } 272 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/tracked/segregated_pref_store.h ('k') | chrome/browser/prefs/tracked/tracked_atomic_preference.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698