Remove most occurences of PrefRegistrySyncable::UNSYNCABLE_PREF

chrome/browser/prefs/prefs_syncable_service_unittest.cc

 // Copyright 2014 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.
 
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 57 matching lines @@
 };
 
 class PrefsSyncableServiceTest : public testing::Test {
  public:
   PrefsSyncableServiceTest() :
       pref_sync_service_(NULL),
       test_processor_(NULL),
       next_pref_remote_sync_node_id_(0) {}
 
   void SetUp() override {
-    prefs_.registry()->RegisterStringPref(
-        kUnsyncedPreferenceName,
-        kUnsyncedPreferenceDefaultValue,
-        user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+    prefs_.registry()->RegisterStringPref(kUnsyncedPreferenceName,
+                                          kUnsyncedPreferenceDefaultValue);
     prefs_.registry()->RegisterStringPref(
         prefs::kHomePage,
         std::string(),
         user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
     prefs_.registry()->RegisterListPref(
         prefs::kURLsToRestoreOnStartup,
         user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-    prefs_.registry()->RegisterListPref(
-        prefs::kURLsToRestoreOnStartupOld,
-        user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+    prefs_.registry()->RegisterListPref(prefs::kURLsToRestoreOnStartupOld);
     prefs_.registry()->RegisterStringPref(
         prefs::kDefaultCharset,
         l10n_util::GetStringUTF8(IDS_DEFAULT_ENCODING),
         user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 
     pref_sync_service_ = reinterpret_cast<PrefModelAssociator*>(
         prefs_.GetSyncableService(syncer::PREFERENCES));
     ASSERT_TRUE(pref_sync_service_);
     next_pref_remote_sync_node_id_ = 0;
   }
@@ skipping 613 matching lines @@
 
   InitWithNoSyncData();
 
   scoped_ptr<base::Value> null_value(base::Value::CreateNullValue());
   syncer::SyncChangeList list;
   list.push_back(MakeRemoteChange(
       1, prefs::kHomePage, *null_value, SyncChange::ACTION_DELETE));
   pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);
   EXPECT_TRUE(pref->IsDefaultValue());
 }