This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/policy/consumer_unenrollment_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_unenrollment_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 26 matching lines @@
     fake_service_->SetStatusAndStage(
         ConsumerManagementService::STATUS_ENROLLED,
         ConsumerManagementStage::None());
   }
 
   void SetUp() override {
     DeviceSettingsTestBase::SetUp();
 
     // Set up the ownership, so that we can modify device settings.
     owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-    InitOwner(device_policy_.policy_data().username(), true);
+    InitOwner(AccountId::FromUserEmail(device_policy_.policy_data().username()),
+              true);
     FlushDeviceSettings();
 
 
     // Set up FakeDeviceCloudPolicyManager.
     scoped_ptr<DeviceCloudPolicyStoreChromeOS> store_(
         new DeviceCloudPolicyStoreChromeOS(
             &device_settings_service_,
             install_attributes_.get(),
             base::ThreadTaskRunnerHandle::Get()));
     fake_manager_.reset(new FakeDeviceCloudPolicyManager(
@@ skipping 60 matching lines @@
   EXPECT_EQ(ConsumerManagementStage::UnenrollmentDMServerFailed(),
             fake_service_->GetStage());
   const chromeos::OwnerSettingsServiceChromeOS::ManagementSettings& settings =
       fake_owner_settings_service_->last_settings();
   EXPECT_EQ(policy::MANAGEMENT_MODE_CONSUMER_MANAGED, settings.management_mode);
   EXPECT_EQ("fake_request_token", settings.request_token);
   EXPECT_EQ("fake_device_id", settings.device_id);
 }
 
 }  // namespace policy