CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

BUG=None
R=nkostylev@chromium.org
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/253063002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267158 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 57 insertions, 40 deletions

diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
index b0152ab..58a9d6f 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -8,7 +8,7 @@
 #include "ash/autoclick/autoclick_controller.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/metrics/user_metrics_recorder.h"
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/system/tray/system_tray_notifier.h"
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.h b/chrome/browser/chromeos/accessibility/accessibility_manager.h
index 21584ee..a0aec2c 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.h
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.h
@@ -8,7 +8,7 @@
 #include <set>
 
 #include "ash/accessibility_delegate.h"
-#include "ash/session_state_observer.h"
+#include "ash/session/session_state_observer.h"
 #include "base/callback_list.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/chromeos/accessibility/magnification_manager.cc b/chrome/browser/chromeos/accessibility/magnification_manager.cc
index 60ff17b..6d2b358 100644
--- a/chrome/browser/chromeos/accessibility/magnification_manager.cc
+++ b/chrome/browser/chromeos/accessibility/magnification_manager.cc
@@ -8,7 +8,7 @@
 
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
diff --git a/chrome/browser/chromeos/dbus/printer_service_provider.cc b/chrome/browser/chromeos/dbus/printer_service_provider.cc
index 0f01405..7813159 100644
--- a/chrome/browser/chromeos/dbus/printer_service_provider.cc
+++ b/chrome/browser/chromeos/dbus/printer_service_provider.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/dbus/printer_service_provider.h"
 
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/bind.h"
diff --git a/chrome/browser/chromeos/extensions/first_run_private_api.cc b/chrome/browser/chromeos/extensions/first_run_private_api.cc
index 9f56c96..2828af6 100644
--- a/chrome/browser/chromeos/extensions/first_run_private_api.cc
+++ b/chrome/browser/chromeos/extensions/first_run_private_api.cc
@@ -19,11 +19,11 @@ bool FirstRunPrivateGetLocalizedStringsFunction::RunSync() {
   base::DictionaryValue* localized_strings = new base::DictionaryValue();
   chromeos::User* user =
       chromeos::UserManager::Get()->GetUserByProfile(GetProfile());
-  if (!user->given_name().empty()) {
+  if (!user->GetGivenName().empty()) {
     localized_strings->SetString(
         "greetingHeader",
         l10n_util::GetStringFUTF16(IDS_FIRST_RUN_GREETING_STEP_HEADER,
-                                   user->given_name()));
+                                   user->GetGivenName()));
   } else {
     localized_strings->SetString(
         "greetingHeader",
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
index a626517c4..04e60ce 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -13,7 +13,7 @@
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/callback.h"
diff --git a/chrome/browser/chromeos/login/session_login_browsertest.cc b/chrome/browser/chromeos/login/session_login_browsertest.cc
index 75e5b4928..941485a 100644
--- a/chrome/browser/chromeos/login/session_login_browsertest.cc
+++ b/chrome/browser/chromeos/login/session_login_browsertest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
diff --git a/chrome/browser/chromeos/login/user.cc b/chrome/browser/chromeos/login/user.cc
index f165e55..b1b35e3 100644
--- a/chrome/browser/chromeos/login/user.cc
+++ b/chrome/browser/chromeos/login/user.cc
@@ -10,6 +10,7 @@
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "google_apis/gaia/gaia_auth_util.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ -168,6 +169,10 @@ void UserContext::CopyFrom(const UserContext& other) {
   auth_flow = other.auth_flow;
 }
 
+std::string User::GetEmail() const {
+  return display_email();
+}
+
 base::string16 User::GetDisplayName() const {
   // Fallback to the email account name in case display name haven't been set.
   return display_name_.empty() ?
@@ -175,6 +180,19 @@ base::string16 User::GetDisplayName() const {
       display_name_;
 }
 
+base::string16 User::GetGivenName() const {
+  return given_name_;
+}
+
+const gfx::ImageSkia& User::GetImage() const {
+  return user_image_.image();
+}
+
+std::string User::GetUserID() const {
+  return gaia::CanonicalizeEmail(gaia::SanitizeEmail(
+      email()));
+}
+
 std::string User::GetAccountName(bool use_display_email) const {
   if (use_display_email && !display_email_.empty())
     return GetUserName(display_email_);
diff --git a/chrome/browser/chromeos/login/user.h b/chrome/browser/chromeos/login/user.h
index e80b13b..58eb1a3 100644
--- a/chrome/browser/chromeos/login/user.h
+++ b/chrome/browser/chromeos/login/user.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "ash/session/user_info.h"
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/chromeos/login/user_image.h"
@@ -69,7 +70,7 @@ struct UserContext {
 // returned by |displayed_email()|.
 // Displayed emails are for use in UI only, anywhere else users must be referred
 // to by |email()|.
-class User {
+class User : public ash::UserInfo {
  public:
   // The user type. Used in a histogram; do not modify existing types.
   typedef enum {
@@ -123,19 +124,20 @@ class User {
   // The email the user used to log in.
   const std::string& email() const { return email_; }
 
-  // Returns the human name to display for this user.
-  base::string16 GetDisplayName() const;
+  // The displayed user name.
+  base::string16 display_name() const { return display_name_; }
 
-  // Returns given name of user, or empty string if given name is unknown.
-  const base::string16& given_name() const { return given_name_; }
+  // ash::UserInfo
+  virtual std::string GetEmail() const OVERRIDE;
+  virtual base::string16 GetDisplayName() const OVERRIDE;
+  virtual base::string16 GetGivenName() const OVERRIDE;
+  virtual const gfx::ImageSkia& GetImage() const OVERRIDE;
+  virtual std::string GetUserID() const OVERRIDE;
 
   // Returns the account name part of the email. Use the display form of the
   // email if available and use_display_name == true. Otherwise use canonical.
   std::string GetAccountName(bool use_display_email) const;
 
-  // The image for this user.
-  const gfx::ImageSkia& image() const { return user_image_.image(); }
-
   // Whether the user has a default image.
   bool HasDefaultImage() const;
 
@@ -168,9 +170,6 @@ class User {
   // True if image is being loaded from file.
   bool image_is_loading() const { return image_is_loading_; }
 
-  // The displayed user name.
-  base::string16 display_name() const { return display_name_; }
-
   // The displayed (non-canonical) user email.
   virtual std::string display_email() const;
 
diff --git a/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc b/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
index e895733..0bdb21a 100644
--- a/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
diff --git a/chrome/browser/chromeos/login/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/user_image_manager_browsertest.cc
index 03d3064..796998b 100644
--- a/chrome/browser/chromeos/login/user_image_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/user_image_manager_browsertest.cc
@@ -362,8 +362,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_NonJPEGImageFromFile) {
   EXPECT_FALSE(user->image_is_safe_format());
   // Check image dimensions.
   const gfx::ImageSkia& saved_image = GetDefaultImage(kFirstDefaultImageIndex);
-  EXPECT_EQ(saved_image.width(), user->image().width());
-  EXPECT_EQ(saved_image.height(), user->image().height());
+  EXPECT_EQ(saved_image.width(), user->GetImage().width());
+  EXPECT_EQ(saved_image.height(), user->GetImage().height());
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, NonJPEGImageFromFile) {
@@ -380,8 +380,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, NonJPEGImageFromFile) {
   EXPECT_TRUE(user->image_is_safe_format());
   // Check image dimensions. Images can't be compared since JPEG is lossy.
   const gfx::ImageSkia& saved_image = GetDefaultImage(kFirstDefaultImageIndex);
-  EXPECT_EQ(saved_image.width(), user->image().width());
-  EXPECT_EQ(saved_image.height(), user->image().height());
+  EXPECT_EQ(saved_image.width(), user->GetImage().width());
+  EXPECT_EQ(saved_image.height(), user->GetImage().height());
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserDefaultImageIndex) {
@@ -403,7 +403,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserDefaultImageIndex) {
 
   EXPECT_TRUE(user->HasDefaultImage());
   EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
-  EXPECT_TRUE(test::AreImagesEqual(default_image, user->image()));
+  EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
 }
 
@@ -432,7 +432,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImage) {
 
   EXPECT_FALSE(user->HasDefaultImage());
   EXPECT_EQ(User::kExternalImageIndex, user->image_index());
-  EXPECT_TRUE(test::AreImagesEqual(custom_image, user->image()));
+  EXPECT_TRUE(test::AreImagesEqual(custom_image, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1,
                          User::kExternalImageIndex,
                          GetUserImagePath(kTestUser1, "jpg"));
@@ -470,7 +470,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromFile) {
 
   EXPECT_FALSE(user->HasDefaultImage());
   EXPECT_EQ(User::kExternalImageIndex, user->image_index());
-  EXPECT_TRUE(test::AreImagesEqual(*custom_image, user->image()));
+  EXPECT_TRUE(test::AreImagesEqual(*custom_image, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1,
                          User::kExternalImageIndex,
                          GetUserImagePath(kTestUser1, "jpg"));
@@ -514,7 +514,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromProfileImage) {
 
   EXPECT_FALSE(user->HasDefaultImage());
   EXPECT_EQ(User::kProfileImageIndex, user->image_index());
-  EXPECT_TRUE(test::AreImagesEqual(profile_image, user->image()));
+  EXPECT_TRUE(test::AreImagesEqual(profile_image, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1,
                          User::kProfileImageIndex,
                          GetUserImagePath(kTestUser1, "jpg"));
@@ -564,7 +564,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
 
   EXPECT_TRUE(user->HasDefaultImage());
   EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
-  EXPECT_TRUE(test::AreImagesEqual(default_image, user->image()));
+  EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
 }
 
@@ -679,7 +679,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, SetAndClear) {
 
   EXPECT_FALSE(user->HasDefaultImage());
   EXPECT_EQ(User::kExternalImageIndex, user->image_index());
-  EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->image()));
+  EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1,
                          User::kExternalImageIndex,
                          GetUserImagePath(kTestUser1, "jpg"));
@@ -707,7 +707,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, SetAndClear) {
 
   EXPECT_FALSE(user->HasDefaultImage());
   EXPECT_EQ(User::kExternalImageIndex, user->image_index());
-  EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->image()));
+  EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1,
                          User::kExternalImageIndex,
                          GetUserImagePath(kTestUser1, "jpg"));
@@ -730,7 +730,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, SetAndClear) {
 
   EXPECT_TRUE(user->HasDefaultImage());
   EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
-  EXPECT_TRUE(test::AreImagesEqual(default_image, user->image()));
+  EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
 }
 
@@ -763,7 +763,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
 
   EXPECT_TRUE(user->HasDefaultImage());
   EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
-  EXPECT_TRUE(test::AreImagesEqual(default_image, user->image()));
+  EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
 
   // Set policy. Verify that the policy-provided user image is downloaded, set
@@ -779,7 +779,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
 
   EXPECT_FALSE(user->HasDefaultImage());
   EXPECT_EQ(User::kExternalImageIndex, user->image_index());
-  EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->image()));
+  EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1,
                          User::kExternalImageIndex,
                          GetUserImagePath(kTestUser1, "jpg"));
@@ -825,7 +825,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, UserDoesNotOverridePolicy) {
 
   EXPECT_FALSE(user->HasDefaultImage());
   EXPECT_EQ(User::kExternalImageIndex, user->image_index());
-  EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->image()));
+  EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1,
                          User::kExternalImageIndex,
                          GetUserImagePath(kTestUser1, "jpg"));
@@ -846,7 +846,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, UserDoesNotOverridePolicy) {
 
   EXPECT_FALSE(user->HasDefaultImage());
   EXPECT_EQ(User::kExternalImageIndex, user->image_index());
-  EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->image()));
+  EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1,
                          User::kExternalImageIndex,
                          GetUserImagePath(kTestUser1, "jpg"));
diff --git a/chrome/browser/chromeos/login/user_image_manager_impl.cc b/chrome/browser/chromeos/login/user_image_manager_impl.cc
index ea729c7..5ead90d 100644
--- a/chrome/browser/chromeos/login/user_image_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_image_manager_impl.cc
@@ -858,7 +858,7 @@ void UserImageManagerImpl::TryToInitDownloadedProfileImage() {
     // user if it has not been initialized already, the user image is the
     // profile image and the user image has been loaded successfully.
     VLOG(1) << "Profile image initialized from disk.";
-    downloaded_profile_image_ = user->image();
+    downloaded_profile_image_ = user->GetImage();
     profile_image_url_ = user->image_url();
   }
 }
diff --git a/chrome/browser/chromeos/memory/oom_priority_manager.cc b/chrome/browser/chromeos/memory/oom_priority_manager.cc
index d182ebf..a6d408c 100644
--- a/chrome/browser/chromeos/memory/oom_priority_manager.cc
+++ b/chrome/browser/chromeos/memory/oom_priority_manager.cc
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "ash/multi_profile_uma.h"
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index 793ccca..e439529 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -1040,7 +1040,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, UserAvatarImage) {
 
   EXPECT_FALSE(user->HasDefaultImage());
   EXPECT_EQ(chromeos::User::kExternalImageIndex, user->image_index());
-  EXPECT_TRUE(chromeos::test::AreImagesEqual(*policy_image, user->image()));
+  EXPECT_TRUE(chromeos::test::AreImagesEqual(*policy_image, user->GetImage()));
   const base::DictionaryValue* images_pref =
       g_browser_process->local_state()->GetDictionary("user_image_info");
   ASSERT_TRUE(images_pref);
diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos.cc
index 992e758..5860dda 100644
--- a/chrome/browser/chromeos/profiles/profile_list_chromeos.cc
+++ b/chrome/browser/chromeos/profiles/profile_list_chromeos.cc
@@ -50,7 +50,7 @@ void ProfileListChromeOS::RebuildMenu() {
     size_t i = profile_info_->GetIndexOfProfileWithPath(
         ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash()));
 
-    gfx::Image icon = gfx::Image((*it)->image());
+    gfx::Image icon = gfx::Image((*it)->GetImage());
     if (!CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kNewProfileManagement)) {
       // old avatar menu uses resized-small images