sync: Implementation of Priority Preferences.

chrome/browser/sync/profile_sync_service_preference_unittest.cc

Index: chrome/browser/sync/profile_sync_service_preference_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
index ff9fe8776d4c009f64c80d6927e437b1fd1d6c3f..590fb0a4a8cb39409d1b855e0d60e82971d7564d 100644
--- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
@@ -49,6 +49,7 @@ using syncer::ChangeRecord;
 using testing::_;
 using testing::Invoke;
 using testing::Return;
+using testing::Values;
 
 typedef std::map<const std::string, const Value*> PreferenceValues;
 
@@ -72,9 +73,11 @@ ACTION_P(ReturnNewDataTypeManagerWithDebugListener, debug_listener) {
 
 // TODO(zea): Refactor to remove the ProfileSyncService usage.
 class ProfileSyncServicePreferenceTest
-    : public AbstractProfileSyncServiceTest,
-      public syncer::DataTypeDebugInfoListener {
+    : public BaseProfileSyncServiceTest,
+      public syncer::DataTypeDebugInfoListener,
+      public ::testing::TestWithParam<syncer::ModelType> {
  public:
+
   int64 SetSyncedValue(const std::string& name, const Value& value) {
     syncer::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
     syncer::ReadNode root(&trans);
@@ -110,7 +113,8 @@ class ProfileSyncServicePreferenceTest
 
  protected:
   ProfileSyncServicePreferenceTest()
-      : debug_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      : BaseProfileSyncServiceTest(),
+        debug_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
         example_url0_("http://example.com/0"),
         example_url1_("http://example.com/1"),
         example_url2_("http://example.com/2"),
@@ -119,7 +123,8 @@ class ProfileSyncServicePreferenceTest
         non_default_charset_value_("foo") {}
 
   virtual void SetUp() {
-    AbstractProfileSyncServiceTest::SetUp();
+    type_ = GetParam();
+    BaseProfileSyncServiceTest::SetUp();
     profile_.reset(new TestingProfile());
     profile_->CreateRequestContext();
     prefs_ = profile_->GetTestingPrefService();
@@ -132,7 +137,7 @@ class ProfileSyncServicePreferenceTest
 
   virtual void TearDown() {
     profile_.reset();
-    AbstractProfileSyncServiceTest::TearDown();
+    BaseProfileSyncServiceTest::TearDown();
   }
 
   int GetSyncPreferenceCount() {
@@ -156,7 +161,7 @@ class ProfileSyncServicePreferenceTest
             profile_.get(), &TestProfileSyncService::BuildAutoStartAsyncInit));
     sync_service_->set_backend_init_callback(callback);
     pref_sync_service_ = reinterpret_cast<PrefModelAssociator*>(
-        prefs_->GetSyncableService());
+        prefs_->GetSyncableService(type_));
     if (!pref_sync_service_)
       return false;
     ProfileSyncComponentsFactoryMock* components =
@@ -223,9 +228,9 @@ class ProfileSyncServicePreferenceTest
                          const Value& value,
                          syncer::WriteNode* node) {
     syncer::SyncData sync_data;
-    if (!PrefModelAssociator::CreatePrefSyncData(name,
-                                                 value,
-                                                 &sync_data)) {
+    if (!pref_sync_service_->CreatePrefSyncData(name,
+                                                value,
+                                                &sync_data)) {
       return syncer::kInvalidId;
     }
     node->SetEntitySpecifics(sync_data.GetSpecifics());
@@ -243,6 +248,7 @@ class ProfileSyncServicePreferenceTest
     return serialized;
   }
 
+  syncer::ModelType type_;
   scoped_ptr<TestingProfile> profile_;
   TestingPrefServiceSyncable* prefs_;
 
@@ -260,6 +266,11 @@ class ProfileSyncServicePreferenceTest
   std::string non_default_charset_value_;
 };
 
+INSTANTIATE_TEST_CASE_P(MeaningfulTestParameters,
+                        ProfileSyncServicePreferenceTest,
+                        Values(syncer::PREFERENCES,
+                               syncer::PRIORITY_PREFERENCES));
+
 class AddPreferenceEntriesHelper {
  public:
   AddPreferenceEntriesHelper(ProfileSyncServicePreferenceTest* test,
@@ -301,7 +312,7 @@ TEST_F(ProfileSyncServicePreferenceTest, CreatePrefSyncData) {
   const PrefService::Preference* pref =
       prefs_->FindPreference(prefs::kHomePage);
   syncer::SyncData sync_data;
-  EXPECT_TRUE(PrefModelAssociator::CreatePrefSyncData(pref->name(),
+  EXPECT_TRUE(pref_sync_service_->CreatePrefSyncData(pref->name(),
       *pref->GetValue(), &sync_data));
   EXPECT_EQ(std::string(prefs::kHomePage), sync_data.GetTag());
   const sync_pb::PreferenceSpecifics& specifics(sync_data.GetSpecifics().