This CL replaces user_manager::UserID with AccountId.

chrome/browser/extensions/api/settings_private/prefs_util.cc

 // Copyright 2015 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/extensions/api/settings_private/prefs_util.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 245 matching lines @@
 #if defined(OS_CHROMEOS)
   if (IsPrefOwnerControlled(name)) {
     // Check for owner controlled after managed checks because if there is a
     // device policy there is no "owner". (In the unlikely case that both
     // situations apply, either badge is potentially relevant, so the order
     // is somewhat arbitrary).
     pref_object->policy_source =
         settings_private::PolicySource::POLICY_SOURCE_OWNER;
     pref_object->policy_enforcement =
         settings_private::PolicyEnforcement::POLICY_ENFORCEMENT_ENFORCED;
-    pref_object->policy_source_name.reset(
-        new std::string(user_manager::UserManager::Get()->GetOwnerEmail()));
+    pref_object->policy_source_name.reset(new std::string(
+        user_manager::UserManager::Get()->GetOwnerAccountId().GetUserEmail()));
     return pref_object.Pass();
   }
 #endif
 
   if (pref && pref->IsExtensionControlled()) {
     std::string extension_id =
         ExtensionPrefValueMapFactory::GetForBrowserContext(profile_)
             ->GetExtensionControllingPref(pref->name());
     const Extension* extension = ExtensionRegistry::Get(profile_)->
         GetExtensionById(extension_id, ExtensionRegistry::ENABLED);
@@ skipping 219 matching lines @@
 
 bool PrefsUtil::IsCrosSetting(const std::string& pref_name) {
 #if defined(OS_CHROMEOS)
   return CrosSettings::Get()->IsCrosSettings(pref_name);
 #else
   return false;
 #endif
 }
 
 }  // namespace extensions