[Merge to M53]arc: Enable user control for Arc package sync.

components/sync_driver/sync_prefs.cc

 // 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.
 
 #include "components/sync_driver/sync_prefs.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 336 matching lines @@
 
 void SyncPrefs::SetManagedForTest(bool is_managed) {
   DCHECK(CalledOnValidThread());
   pref_service_->SetBoolean(prefs::kSyncManaged, is_managed);
 }
 
 void SyncPrefs::RegisterPrefGroups() {
   pref_groups_[syncer::APPS].Put(syncer::APP_NOTIFICATIONS);
   pref_groups_[syncer::APPS].Put(syncer::APP_SETTINGS);
   pref_groups_[syncer::APPS].Put(syncer::APP_LIST);
+  pref_groups_[syncer::APPS].Put(syncer::ARC_PACKAGE);
 
   pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_PROFILE);
   pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_WALLET_DATA);
   pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_WALLET_METADATA);
 
   pref_groups_[syncer::EXTENSIONS].Put(syncer::EXTENSION_SETTINGS);
 
   pref_groups_[syncer::PREFERENCES].Put(syncer::DICTIONARY);
   pref_groups_[syncer::PREFERENCES].Put(syncer::PRIORITY_PREFERENCES);
   pref_groups_[syncer::PREFERENCES].Put(syncer::SEARCH_ENGINES);
@@ skipping 180 matching lines @@
     return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>();
 
   std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState> result(
       new syncer::SyncEncryptionHandler::NigoriState());
   if (!result->nigori_specifics.ParseFromString(decoded))
     return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>();
   return result;
 }
 
 }  // namespace sync_driver