OLD | NEW |
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 "components/user_prefs/tracked/segregated_pref_store.h" | 5 #include "components/user_prefs/tracked/segregated_pref_store.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
| 9 #include <utility> |
9 | 10 |
10 #include "base/bind.h" | 11 #include "base/bind.h" |
11 #include "base/callback.h" | 12 #include "base/callback.h" |
12 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
13 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
14 #include "base/prefs/persistent_pref_store.h" | 15 #include "base/prefs/persistent_pref_store.h" |
15 #include "base/prefs/pref_store_observer_mock.h" | 16 #include "base/prefs/pref_store_observer_mock.h" |
16 #include "base/prefs/testing_pref_store.h" | 17 #include "base/prefs/testing_pref_store.h" |
17 #include "base/values.h" | 18 #include "base/values.h" |
18 #include "components/user_prefs/tracked/segregated_pref_store.h" | 19 #include "components/user_prefs/tracked/segregated_pref_store.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 selected_pref_names); | 74 selected_pref_names); |
74 | 75 |
75 segregated_store_->AddObserver(&observer_); | 76 segregated_store_->AddObserver(&observer_); |
76 } | 77 } |
77 | 78 |
78 void TearDown() override { segregated_store_->RemoveObserver(&observer_); } | 79 void TearDown() override { segregated_store_->RemoveObserver(&observer_); } |
79 | 80 |
80 protected: | 81 protected: |
81 scoped_ptr<PersistentPrefStore::ReadErrorDelegate> GetReadErrorDelegate() { | 82 scoped_ptr<PersistentPrefStore::ReadErrorDelegate> GetReadErrorDelegate() { |
82 EXPECT_TRUE(read_error_delegate_); | 83 EXPECT_TRUE(read_error_delegate_); |
83 return read_error_delegate_.Pass(); | 84 return std::move(read_error_delegate_); |
84 } | 85 } |
85 | 86 |
86 PrefStoreObserverMock observer_; | 87 PrefStoreObserverMock observer_; |
87 | 88 |
88 scoped_refptr<TestingPrefStore> default_store_; | 89 scoped_refptr<TestingPrefStore> default_store_; |
89 scoped_refptr<TestingPrefStore> selected_store_; | 90 scoped_refptr<TestingPrefStore> selected_store_; |
90 scoped_refptr<SegregatedPrefStore> segregated_store_; | 91 scoped_refptr<SegregatedPrefStore> segregated_store_; |
91 | 92 |
92 MockReadErrorDelegate::Data read_error_delegate_data_; | 93 MockReadErrorDelegate::Data read_error_delegate_data_; |
93 | 94 |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 selected_store_->SetBlockAsyncRead(true); | 265 selected_store_->SetBlockAsyncRead(true); |
265 default_store_->SetBlockAsyncRead(true); | 266 default_store_->SetBlockAsyncRead(true); |
266 EXPECT_FALSE(segregated_store_->IsInitializationComplete()); | 267 EXPECT_FALSE(segregated_store_->IsInitializationComplete()); |
267 segregated_store_->ReadPrefsAsync(NULL); | 268 segregated_store_->ReadPrefsAsync(NULL); |
268 EXPECT_FALSE(segregated_store_->IsInitializationComplete()); | 269 EXPECT_FALSE(segregated_store_->IsInitializationComplete()); |
269 selected_store_->SetBlockAsyncRead(false); | 270 selected_store_->SetBlockAsyncRead(false); |
270 EXPECT_FALSE(segregated_store_->IsInitializationComplete()); | 271 EXPECT_FALSE(segregated_store_->IsInitializationComplete()); |
271 default_store_->SetBlockAsyncRead(false); | 272 default_store_->SetBlockAsyncRead(false); |
272 EXPECT_TRUE(segregated_store_->IsInitializationComplete()); | 273 EXPECT_TRUE(segregated_store_->IsInitializationComplete()); |
273 } | 274 } |
OLD | NEW |