prefs / sync: rewrite ProfileSyncServicePreferenceTest to rely on sync/api instead of c/b/s/glue.

chrome/browser/prefs/pref_model_associator.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_

[Nicolas Zea, 2014/04/25 20:43:18]

Should we go ahead and rename this prefs_syncable_service?

[Mattias Nissler (ping if slow), 2014/04/28 11:35:42]

That would create a great deal of confusion given the existing
PrefServiceSyncable.

[tim (not reviewing), 2014/04/28 18:28:51]

Hmm, seems like it. Wasn't sure why it was named this way actually.  I just
noticed pref_model_associator_unittest exists, although it doesn't test any of
the sync stuff.  Mind if I do a follow up to rename+merge these two things?

[tim (not reviewing), 2014/04/28 18:29:52]

Drafted this before I saw mnissler's mail... As a non-prefs expert I defer to
his judgement on this one.

 #define CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/gtest_prod_util.h"
@@ skipping 87 matching lines @@
 
   // Adds a SyncedPrefObserver to watch for changes to a specific pref.
   void AddSyncedPrefObserver(const std::string& name,
                              SyncedPrefObserver* observer);
 
   // Removes a SyncedPrefObserver from a pref's list of observers.
   void RemoveSyncedPrefObserver(const std::string& name,
                                 SyncedPrefObserver* observer);
 
  protected:
-  friend class ProfileSyncServicePreferenceTest;
+  friend class PrefsSyncableServiceTest;
 
   typedef std::map<std::string, syncer::SyncData> SyncDataMap;
 
   // Create an association for a given preference. If |sync_pref| is valid,
   // signifying that sync has data for this preference, we reconcile their data
   // with ours and append a new UPDATE SyncChange to |sync_changes|. If
   // sync_pref is not set, we append an ADD SyncChange to |sync_changes| with
   // the current preference data.
   // |migrated_preference_list| points to a vector that may be updated with a
   // string containing the old name of the preference described by |pref_name|.
@@ skipping 62 matching lines @@
       SyncedPrefObserverMap;
 
   void NotifySyncedPrefObservers(const std::string& path, bool from_sync) const;
 
   SyncedPrefObserverMap synced_pref_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_