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

Unified Diff: components/user_prefs/tracked/segregated_pref_store_unittest.cc

Issue 1227973003: Componentize //chrome/browser/prefs/tracked. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: components/user_prefs/tracked/segregated_pref_store_unittest.cc
diff --git a/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc b/components/user_prefs/tracked/segregated_pref_store_unittest.cc
similarity index 93%
rename from chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc
rename to components/user_prefs/tracked/segregated_pref_store_unittest.cc
index 04e07084db8d7025ec42cecf47ccba6b09ae0b17..dc458a5582c44b72fdc92a70bd76e03183c18eb8 100644
--- a/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc
+++ b/components/user_prefs/tracked/segregated_pref_store_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/prefs/tracked/segregated_pref_store.h"
+#include "components/user_prefs/tracked/segregated_pref_store.h"
#include <set>
#include <string>
@@ -15,7 +15,7 @@
#include "base/prefs/pref_store_observer_mock.h"
#include "base/prefs/testing_pref_store.h"
#include "base/values.h"
-#include "chrome/browser/prefs/tracked/segregated_pref_store.h"
+#include "components/user_prefs/tracked/segregated_pref_store.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
@@ -69,10 +69,8 @@ class SegregatedPrefStoreTest : public testing::Test {
std::set<std::string> selected_pref_names;
selected_pref_names.insert(kSelectedPref);
- segregated_store_ = new SegregatedPrefStore(
- default_store_,
- selected_store_,
- selected_pref_names);
+ segregated_store_ = new SegregatedPrefStore(default_store_, selected_store_,
+ selected_pref_names);
segregated_store_->AddObserver(&observer_);
}
@@ -168,8 +166,7 @@ TEST_F(SegregatedPrefStoreTest, Observer) {
TEST_F(SegregatedPrefStoreTest, SelectedPrefReadNoFileError) {
// PREF_READ_ERROR_NO_FILE for the selected prefs file is silently converted
// to PREF_READ_ERROR_NONE.
- selected_store_->set_read_error(
- PersistentPrefStore::PREF_READ_ERROR_NO_FILE);
+ selected_store_->set_read_error(PersistentPrefStore::PREF_READ_ERROR_NO_FILE);
EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NONE,
segregated_store_->ReadPrefs());
EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NONE,
@@ -188,8 +185,7 @@ TEST_F(SegregatedPrefStoreTest, SelectedPrefReadError) {
TEST_F(SegregatedPrefStoreTest, SelectedPrefReadNoFileErrorAsync) {
// PREF_READ_ERROR_NO_FILE for the selected prefs file is silently converted
// to PREF_READ_ERROR_NONE.
- selected_store_->set_read_error(
- PersistentPrefStore::PREF_READ_ERROR_NO_FILE);
+ selected_store_->set_read_error(PersistentPrefStore::PREF_READ_ERROR_NO_FILE);
default_store_->SetBlockAsyncRead(true);
@@ -210,8 +206,7 @@ TEST_F(SegregatedPrefStoreTest, SelectedPrefReadNoFileErrorAsync) {
}
TEST_F(SegregatedPrefStoreTest, UnselectedPrefReadNoFileError) {
- default_store_->set_read_error(
- PersistentPrefStore::PREF_READ_ERROR_NO_FILE);
+ default_store_->set_read_error(PersistentPrefStore::PREF_READ_ERROR_NO_FILE);
EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NO_FILE,
segregated_store_->ReadPrefs());
EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NO_FILE,
@@ -228,8 +223,7 @@ TEST_F(SegregatedPrefStoreTest, UnselectedPrefReadError) {
}
TEST_F(SegregatedPrefStoreTest, BothPrefReadError) {
- default_store_->set_read_error(
- PersistentPrefStore::PREF_READ_ERROR_NO_FILE);
+ default_store_->set_read_error(PersistentPrefStore::PREF_READ_ERROR_NO_FILE);
selected_store_->set_read_error(
PersistentPrefStore::PREF_READ_ERROR_ACCESS_DENIED);
EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NO_FILE,
@@ -239,8 +233,7 @@ TEST_F(SegregatedPrefStoreTest, BothPrefReadError) {
}
TEST_F(SegregatedPrefStoreTest, BothPrefReadErrorAsync) {
- default_store_->set_read_error(
- PersistentPrefStore::PREF_READ_ERROR_NO_FILE);
+ default_store_->set_read_error(PersistentPrefStore::PREF_READ_ERROR_NO_FILE);
selected_store_->set_read_error(
PersistentPrefStore::PREF_READ_ERROR_ACCESS_DENIED);
« no previous file with comments | « components/user_prefs/tracked/segregated_pref_store.cc ('k') | components/user_prefs/tracked/tracked_atomic_preference.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698