This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/policy/consumer_management_notifier_factory_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_management_notifier_factory.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
@@ skipping 26 matching lines @@
         ConsumerManagementService::STATUS_UNENROLLED,
         ConsumerManagementStage::None());
 
     // Inject fake objects.
     BrowserPolicyConnectorChromeOS* connector =
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
     connector->SetConsumerManagementServiceForTesting(
         make_scoped_ptr(fake_service_));
 
     // 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());
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   FakeConsumerManagementService* fake_service_;
   chromeos::FakeChromeUserManager* fake_user_manager_;
   chromeos::ScopedUserManagerEnabler scoped_user_manager_enabler_;
   scoped_ptr<TestingProfileManager> testing_profile_manager_;
 };
 
 TEST_F(ConsumerManagementNotifierFactoryTest, ServiceIsCreated) {
   Profile* profile = testing_profile_manager_->CreateTestingProfile(kTestOwner);
   EXPECT_TRUE(
       ConsumerManagementNotifierFactory::GetForBrowserContext(profile));
 }
 
 TEST_F(ConsumerManagementNotifierFactoryTest,
        ServiceIsNotCreatedForNonOwner) {
   Profile* profile = testing_profile_manager_->CreateTestingProfile(kTestUser);
   EXPECT_FALSE(
       ConsumerManagementNotifierFactory::GetForBrowserContext(profile));
 }
 
 }  // namespace policy