Revert of This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/ownership/owner_settings_service_chromeos_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 <queue>
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 82 matching lines @@
       : service_(nullptr),
         local_state_(TestingBrowserProcess::GetGlobal()),
         user_data_dir_override_(chrome::DIR_USER_DATA),
         management_settings_set_(false) {}
 
   void SetUp() override {
     DeviceSettingsTestBase::SetUp();
     provider_.reset(new DeviceSettingsProvider(base::Bind(&OnPrefChanged),
                                                &device_settings_service_));
     owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-    InitOwner(AccountId::FromUserEmail(device_policy_.policy_data().username()),
-              true);
+    InitOwner(device_policy_.policy_data().username(), true);
     FlushDeviceSettings();
 
     service_ = OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(
         profile_.get());
     ASSERT_TRUE(service_);
     ASSERT_TRUE(service_->IsOwner());
 
     device_policy_.policy_data().set_management_mode(
         em::PolicyData::LOCAL_OWNER);
     device_policy_.Build();
@@ skipping 221 matching lines @@
 };
 
 TEST_F(OwnerSettingsServiceChromeOSNoOwnerTest, SingleSetTest) {
   ASSERT_FALSE(service_->SetBoolean(kAccountsPrefAllowGuest, false));
 }
 
 TEST_F(OwnerSettingsServiceChromeOSNoOwnerTest, TakeOwnershipForceWhitelist) {
   EXPECT_FALSE(FindInListValue(device_policy_.policy_data().username(),
                                provider_->Get(kAccountsPrefUsers)));
   owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-  InitOwner(AccountId::FromUserEmail(device_policy_.policy_data().username()),
-            true);
+  InitOwner(device_policy_.policy_data().username(), true);
   ReloadDeviceSettings();
   ASSERT_TRUE(service_->IsOwner());
 
   EXPECT_TRUE(FindInListValue(device_policy_.policy_data().username(),
                               provider_->Get(kAccountsPrefUsers)));
 }
 
 }  // namespace chromeos