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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/prefs/pref_model_associator_unittest.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Really fix. And rebase Created 9 years, 7 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
« no previous file with comments | « chrome/browser/prefs/pref_model_associator.cc ('k') | chrome/browser/prefs/pref_notifier_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/pref_model_associator_unittest.cc
diff --git a/chrome/browser/sync/glue/preference_model_associator_unittest.cc b/chrome/browser/prefs/pref_model_associator_unittest.cc
similarity index 91%
rename from chrome/browser/sync/glue/preference_model_associator_unittest.cc
rename to chrome/browser/prefs/pref_model_associator_unittest.cc
index 7ed60b026ae6ddbe0fc7ca1cbc57034967a68039..6abf38efeaa121f17dec35f3aeed3932400c1046 100644
--- a/chrome/browser/sync/glue/preference_model_associator_unittest.cc
+++ b/chrome/browser/prefs/pref_model_associator_unittest.cc
@@ -4,14 +4,12 @@
#include "base/memory/scoped_ptr.h"
#include "base/values.h"
+#include "chrome/browser/prefs/pref_model_associator.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
-#include "chrome/browser/sync/glue/preference_model_associator.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/testing_profile.h"
#include "testing/gtest/include/gtest/gtest.h"
-using browser_sync::PreferenceModelAssociator;
-
class AbstractPreferenceMergeTest : public testing::Test {
protected:
virtual void SetUp() {
@@ -81,7 +79,7 @@ TEST_F(ListPreferenceMergeTest, NotListOrDictionary) {
pref_service_->FindPreference(prefs::kHomePage);
scoped_ptr<Value> server_value(Value::CreateStringValue(server_url0_));
scoped_ptr<Value> merged_value(
- PreferenceModelAssociator::MergePreference(*pref, *server_value));
+ PrefModelAssociator::MergePreference(*pref, *server_value));
EXPECT_TRUE(merged_value->Equals(server_value.get()));
}
@@ -90,7 +88,7 @@ TEST_F(ListPreferenceMergeTest, LocalEmpty) {
const PrefService::Preference* pref =
pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
scoped_ptr<Value> merged_value(
- PreferenceModelAssociator::MergePreference(*pref, server_url_list_));
+ PrefModelAssociator::MergePreference(*pref, server_url_list_));
EXPECT_TRUE(merged_value->Equals(&server_url_list_));
}
@@ -105,7 +103,7 @@ TEST_F(ListPreferenceMergeTest, ServerNull) {
const PrefService::Preference* pref =
pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
scoped_ptr<Value> merged_value(
- PreferenceModelAssociator::MergePreference(*pref, *null_value));
+ PrefModelAssociator::MergePreference(*pref, *null_value));
const ListValue* local_list_value =
pref_service_->GetList(prefs::kURLsToRestoreOnStartup);
EXPECT_TRUE(merged_value->Equals(local_list_value));
@@ -122,7 +120,7 @@ TEST_F(ListPreferenceMergeTest, ServerEmpty) {
const PrefService::Preference* pref =
pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
scoped_ptr<Value> merged_value(
- PreferenceModelAssociator::MergePreference(*pref, *empty_value));
+ PrefModelAssociator::MergePreference(*pref, *empty_value));
const ListValue* local_list_value =
pref_service_->GetList(prefs::kURLsToRestoreOnStartup);
EXPECT_TRUE(merged_value->Equals(local_list_value));
@@ -139,7 +137,7 @@ TEST_F(ListPreferenceMergeTest, Merge) {
const PrefService::Preference* pref =
pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
scoped_ptr<Value> merged_value(
- PreferenceModelAssociator::MergePreference(*pref, server_url_list_));
+ PrefModelAssociator::MergePreference(*pref, server_url_list_));
ListValue expected;
expected.Append(Value::CreateStringValue(server_url0_));
@@ -161,7 +159,7 @@ TEST_F(ListPreferenceMergeTest, Duplicates) {
const PrefService::Preference* pref =
pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
scoped_ptr<Value> merged_value(
- PreferenceModelAssociator::MergePreference(*pref, server_url_list_));
+ PrefModelAssociator::MergePreference(*pref, server_url_list_));
ListValue expected;
expected.Append(Value::CreateStringValue(server_url0_));
@@ -182,7 +180,7 @@ TEST_F(ListPreferenceMergeTest, Equals) {
const PrefService::Preference* pref =
pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
scoped_ptr<Value> merged_value(
- PreferenceModelAssociator::MergePreference(*pref, server_url_list_));
+ PrefModelAssociator::MergePreference(*pref, server_url_list_));
EXPECT_TRUE(merged_value->Equals(original.get()));
}
@@ -215,7 +213,7 @@ TEST_F(DictionaryPreferenceMergeTest, LocalEmpty) {
const PrefService::Preference* pref =
pref_service_->FindPreference(prefs::kContentSettingsPatterns);
scoped_ptr<Value> merged_value(
- PreferenceModelAssociator::MergePreference(*pref, server_patterns_));
+ PrefModelAssociator::MergePreference(*pref, server_patterns_));
EXPECT_TRUE(merged_value->Equals(&server_patterns_));
}
@@ -230,7 +228,7 @@ TEST_F(DictionaryPreferenceMergeTest, ServerNull) {
const PrefService::Preference* pref =
pref_service_->FindPreference(prefs::kContentSettingsPatterns);
scoped_ptr<Value> merged_value(
- PreferenceModelAssociator::MergePreference(*pref, *null_value));
+ PrefModelAssociator::MergePreference(*pref, *null_value));
const DictionaryValue* local_dict_value =
pref_service_->GetDictionary(prefs::kContentSettingsPatterns);
EXPECT_TRUE(merged_value->Equals(local_dict_value));
@@ -247,7 +245,7 @@ TEST_F(DictionaryPreferenceMergeTest, ServerEmpty) {
const PrefService::Preference* pref =
pref_service_->FindPreference(prefs::kContentSettingsPatterns);
scoped_ptr<Value> merged_value(
- PreferenceModelAssociator::MergePreference(*pref, *empty_value));
+ PrefModelAssociator::MergePreference(*pref, *empty_value));
const DictionaryValue* local_dict_value =
pref_service_->GetDictionary(prefs::kContentSettingsPatterns);
EXPECT_TRUE(merged_value->Equals(local_dict_value));
@@ -260,7 +258,7 @@ TEST_F(DictionaryPreferenceMergeTest, MergeNoConflicts) {
SetContentPattern(local_dict_value, expression2_, content_type0_, 1);
}
- scoped_ptr<Value> merged_value(PreferenceModelAssociator::MergePreference(
+ scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference(
*pref_service_->FindPreference(prefs::kContentSettingsPatterns),
server_patterns_));
@@ -282,7 +280,7 @@ TEST_F(DictionaryPreferenceMergeTest, MergeConflicts) {
SetContentPattern(local_dict_value, expression2_, content_type0_, 2);
}
- scoped_ptr<Value> merged_value(PreferenceModelAssociator::MergePreference(
+ scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference(
*pref_service_->FindPreference(prefs::kContentSettingsPatterns),
server_patterns_));
@@ -304,7 +302,7 @@ TEST_F(DictionaryPreferenceMergeTest, Equal) {
SetContentPattern(local_dict_value, expression1_, content_type0_, 1);
}
- scoped_ptr<Value> merged_value(PreferenceModelAssociator::MergePreference(
+ scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference(
*pref_service_->FindPreference(prefs::kContentSettingsPatterns),
server_patterns_));
EXPECT_TRUE(merged_value->Equals(&server_patterns_));
@@ -319,7 +317,7 @@ TEST_F(DictionaryPreferenceMergeTest, ConflictButServerWins) {
SetContentPattern(local_dict_value, expression1_, content_type0_, 1);
}
- scoped_ptr<Value> merged_value(PreferenceModelAssociator::MergePreference(
+ scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference(
*pref_service_->FindPreference(prefs::kContentSettingsPatterns),
server_patterns_));
EXPECT_TRUE(merged_value->Equals(&server_patterns_));
@@ -347,7 +345,7 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest {
local_list_value->Append(Value::CreateStringValue(url1_));
}
- scoped_ptr<Value> merged_value(PreferenceModelAssociator::MergePreference(
+ scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference(
*pref_service_->FindPreference(pref),
server_url_list_));
@@ -364,7 +362,7 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest {
SetContentPattern(local_dict_value, expression1_, content_type0_, 1);
}
- scoped_ptr<Value> merged_value(PreferenceModelAssociator::MergePreference(
+ scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference(
*pref_service_->FindPreference(pref),
server_patterns_));
« no previous file with comments | « chrome/browser/prefs/pref_model_associator.cc ('k') | chrome/browser/prefs/pref_notifier_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698