Rename UserInfo method GetEmail to GetDisplayEmail.

ash/common/system/user/tray_user_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 <vector>
 
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/user/tray_user.h"
@@ skipping 240 matching lines @@
   ui::test::EventGenerator& generator = GetEventGenerator();
   ShowTrayMenu(&generator);
 
   // Switch to a new user - which has a capitalized name.
   ClickUserItem(&generator, 1);
   const user_manager::UserInfo* active_user = delegate()->GetActiveUserInfo();
   const user_manager::UserInfo* second_user = delegate()->GetUserInfo(1);
   EXPECT_EQ(active_user->GetAccountId(), second_user->GetAccountId());
   // Since the name is capitalized, the email should be different then the
   // user_id.
-  EXPECT_NE(active_user->GetAccountId().GetUserEmail(),
-            second_user->GetEmail());
+  EXPECT_NE(active_user->GetAccountId(), second_user->GetAccountId())
+      << "User switch failed: active_user:"
+      << active_user->GetAccountId().Serialize()
+      << ", second_user:" << second_user->GetAccountId().Serialize();
   tray()->CloseSystemBubble();
 }
 
 #endif
 
 }  // namespace ash