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

chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc

 // Copyright 2013 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 <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 32 matching lines @@
 const char kTestEmail[] = "test_email@chromium.org";
 const char kTestURL[] = "http://mytestdomain/test";
 
 class FakeDelegate : public PlatformVerificationFlow::Delegate {
  public:
   FakeDelegate()
       : url_(kTestURL),
         is_permitted_by_user_(true),
         is_in_supported_mode_(true) {
     // Configure a user for the mock user manager.
-    mock_user_manager_.SetActiveUser(AccountId::FromUserEmail(kTestEmail));
+    mock_user_manager_.SetActiveUser(kTestEmail);
   }
   ~FakeDelegate() override {}
 
   const GURL& GetURL(content::WebContents* web_contents) override {
     return url_;
   }
 
   user_manager::User* GetUser(content::WebContents* web_contents) override {
     return mock_user_manager_.GetActiveUser();
   }
@@ skipping 335 matching lines @@
 TEST_F(PlatformVerificationFlowTest, AttestationNotPrepared) {
   fake_cryptohome_client_.set_attestation_enrolled(false);
   fake_cryptohome_client_.set_attestation_prepared(false);
   verifier_->ChallengePlatformKey(NULL, kTestID, kTestChallenge, callback_);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(PlatformVerificationFlow::PLATFORM_NOT_VERIFIED, result_);
 }
 
 }  // namespace attestation
 }  // namespace chromeos