Revert of Add account_type into AccountId

chromeos/tpm/tpm_token_info_getter_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 <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 241 matching lines @@
 
  private:
   base::MessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTPMTokenInfoGetterTest);
 };
 
 class UserTPMTokenInfoGetterTest : public testing::Test {
  public:
   UserTPMTokenInfoGetterTest()
-      : account_id_(AccountId::FromUserEmail("user@gmail.com")) {}
+      : account_id_(AccountId::FromUserEmail("user")) {}
   ~UserTPMTokenInfoGetterTest() override {}
 
   void SetUp() override {
     cryptohome_client_.reset(new TestCryptohomeClient(account_id_));
     tpm_token_info_getter_ = chromeos::TPMTokenInfoGetter::CreateForUserToken(
         account_id_, cryptohome_client_.get(),
         scoped_refptr<base::TaskRunner>(new FakeTaskRunner(&delays_)));
   }
 
  protected:
@@ skipping 240 matching lines @@
   EXPECT_EQ("2222", reported_info.pin);
   EXPECT_EQ(1, reported_info.slot_id);
 
   const int64_t kExpectedDelays[] = {100};
   EXPECT_EQ(std::vector<int64_t>(kExpectedDelays,
                                  kExpectedDelays + arraysize(kExpectedDelays)),
             delays_);
 }
 
 }  // namespace