This CL replaces user_manager::UserID with AccountId.

chrome/browser/profiles/profile_impl.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 "chrome/browser/profiles/profile_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 1114 matching lines @@
     default: {
       NOTREACHED();
       break;
     }
   }
   if (do_update_pref)
     GetPrefs()->SetString(prefs::kApplicationLocale, new_locale);
   if (via != APP_LOCALE_CHANGED_VIA_PUBLIC_SESSION_LOGIN)
     local_state->SetString(prefs::kApplicationLocale, new_locale);
 
-  if (user_manager::UserManager::Get()->GetOwnerEmail() ==
-      chromeos::ProfileHelper::Get()->GetUserByProfile(this)->email())
+  if (user_manager::UserManager::Get()->GetOwnerAccountId() ==
+      chromeos::ProfileHelper::Get()->GetUserByProfile(this)->GetAccountId())
     local_state->SetString(prefs::kOwnerLocale, new_locale);
 }
 
 void ProfileImpl::OnLogin() {
   if (locale_change_guard_ == NULL)
     locale_change_guard_.reset(new chromeos::LocaleChangeGuard(this));
   locale_change_guard_->OnLogin();
 }
 
 void ProfileImpl::InitChromeOSPreferences() {
@@ skipping 138 matching lines @@
 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
   domain_reliability::DomainReliabilityService* service =
       domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
           GetForBrowserContext(this);
   if (!service)
     return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
 
   return service->CreateMonitor(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
 }