This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/policy/consumer_enrollment_handler_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 "chrome/browser/chromeos/policy/consumer_enrollment_handler.h"
 
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
@@ skipping 44 matching lines @@
 
     // Inject fake objects.
     BrowserPolicyConnectorChromeOS* connector =
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
     connector->SetConsumerManagementServiceForTesting(
         make_scoped_ptr(fake_service_));
     connector->SetDeviceCloudPolicyInitializerForTesting(
         make_scoped_ptr(fake_initializer_));
 
     // Set up FakeChromeUserManager.
-    fake_user_manager_->AddUser(kTestOwner);
-    fake_user_manager_->AddUser(kTestUser);
-    fake_user_manager_->set_owner_email(kTestOwner);
+    fake_user_manager_->AddUser(AccountId::FromUserEmail(kTestOwner));
+    fake_user_manager_->AddUser(AccountId::FromUserEmail(kTestUser));
+    fake_user_manager_->set_owner_id(AccountId::FromUserEmail(kTestOwner));
   }
 
   void SetUp() override {
     ASSERT_TRUE(testing_profile_manager_->SetUp());
     TestingProfile::TestingFactories factories;
     factories.push_back(
         std::make_pair(ProfileOAuth2TokenServiceFactory::GetInstance(),
                        BuildAutoIssuingFakeProfileOAuth2TokenService));
     profile_ = testing_profile_manager_->CreateTestingProfile(
         kTestUser, scoped_ptr<syncable_prefs::PrefServiceSyncable>(),
@@ skipping 69 matching lines @@
       EnrollmentStatus::STATUS_REGISTRATION_FAILED));
 
   RunEnrollmentTest();
 
   EXPECT_TRUE(fake_initializer_->was_start_enrollment_called());
   EXPECT_EQ(ConsumerManagementStage::EnrollmentDMServerFailed(),
             fake_service_->GetStage());
 }
 
 }  // namespace policy