Save Play user id when ARC user gets a Managed Google Play account

chrome/browser/prefs/browser_prefs.cc

 // Copyright 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 "chrome/browser/prefs/browser_prefs.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_content_browser_client.h"
+#include "chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher.h"

[Greg Levin, 2017/02/21 17:35:47]

This should be moved down to the "#if defined(OS_CHROMEOS)" section of includes
(starting on line 175).

[Marton Hunyady, 2017/02/22 15:21:21]

Done.

 #include "chrome/browser/component_updater/component_updater_prefs.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/engagement/important_sites_util.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/geolocation/geolocation_prefs.h"
 #include "chrome/browser/gpu/gpu_mode_manager.h"
 #include "chrome/browser/gpu/gpu_profile_cache.h"
@@ skipping 539 matching lines @@
   gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
   gcm::RegisterProfilePrefs(registry);
   StartupBrowserCreator::RegisterProfilePrefs(registry);
 #endif
 
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
   default_apps::RegisterProfilePrefs(registry);
 #endif
 
 #if defined(OS_CHROMEOS)
+  arc::ArcActiveDirectoryEnrollmentTokenFetcher::RegisterProfilePrefs(registry);
   arc::ArcSessionManager::RegisterProfilePrefs(registry);
   arc::ArcPolicyBridge::RegisterProfilePrefs(registry);
   chromeos::first_run::RegisterProfilePrefs(registry);
   chromeos::file_system_provider::RegisterProfilePrefs(registry);
   chromeos::KeyPermissions::RegisterProfilePrefs(registry);
   chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
   chromeos::PinStorage::RegisterProfilePrefs(registry);
   chromeos::Preferences::RegisterProfilePrefs(registry);
   chromeos::PrintersManager::RegisterProfilePrefs(registry);
   chromeos::RegisterQuickUnlockProfilePrefs(registry);
@@ skipping 140 matching lines @@
   profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
   profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   // Added 2/2017.
   profile_prefs->ClearPref(kToolbarMigratedComponentActionStatus);
 #endif
 }
 
 }  // namespace chrome