Rename UserInfo method GetEmail to GetDisplayEmail.

components/user_manager/empty_user_info.h

 // 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.
 
 #ifndef COMPONENTS_USER_MANAGER_EMPTY_USER_INFO_H_
 #define COMPONENTS_USER_MANAGER_EMPTY_USER_INFO_H_
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/user_manager/user_info.h"
 #include "components/user_manager/user_manager_export.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace user_manager {
 
 // Trivial implementation of UserInfo interface which triggers
 // NOTIMPLEMENTED() for each method.
 class USER_MANAGER_EXPORT EmptyUserInfo : public UserInfo {

[xiyuan, 2016/10/26 17:26:17]

While looking at the user_manager code, I found no code actually uses
EmptyUserInfo. So maybe we get rid of it?

[Alexander Alekseev, 2016/10/27 18:11:37]

Done.

  public:
   EmptyUserInfo();
   ~EmptyUserInfo() override;
 
   // UserInfo:
   base::string16 GetDisplayName() const override;
   base::string16 GetGivenName() const override;
-  std::string GetEmail() const override;
+  std::string GetDisplayEmail() const override;
   const AccountId& GetAccountId() const override;
   const gfx::ImageSkia& GetImage() const override;
 
  private:
   const gfx::ImageSkia null_image_;
 
   DISALLOW_COPY_AND_ASSIGN(EmptyUserInfo);
 };
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_EMPTY_USER_INFO_H_