Not for check-in. Manually reviewable parts of https://codereview.chromium.org/11570009/

chrome/browser/prefs/scoped_user_pref_update_unittest.cc

Index: chrome/browser/prefs/scoped_user_pref_update_unittest.cc
diff --git a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc
index c06d5ef945524403cc360d37bf140e744fde746d..05e9c846a36b382eecf3034cc42798df2a34b5a3 100644
--- a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc
+++ b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc
@@ -19,7 +19,8 @@ class ScopedUserPrefUpdateTest : public testing::Test {
 
  protected:
   virtual void SetUp() {
-    prefs_.RegisterDictionaryPref(kPref, PrefService::UNSYNCABLE_PREF);
+    prefs_.RegisterDictionaryPref(kPref,
+                                  PrefServiceSyncable::UNSYNCABLE_PREF);
     registrar_.Init(&prefs_);
     registrar_.Add(kPref, observer_.GetCallback());
   }
@@ -28,7 +29,7 @@ class ScopedUserPrefUpdateTest : public testing::Test {
   static const char kKey[];
   static const char kValue[];
 
-  TestingPrefService prefs_;
+  TestingPrefServiceSyncable prefs_;
   MockPrefChangeCallback observer_;
   PrefChangeRegistrar registrar_;
 };