UserManager stack refactoring.

chrome/browser/chromeos/login/users/fake_chrome_user_manager.h

Index: chrome/browser/chromeos/login/users/fake_chrome_user_manager.h
diff --git a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.h b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..ec8d810456b939d7117fdf68a4698c21bc6344d2
--- /dev/null
+++ b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.h
@@ -0,0 +1,84 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.

[Nikita (slow), 2015/01/20 18:22:13]

nit: Can you please try to use lower value for
git cl upload --similarity=xx

Default is 50 and lowering that should help to make fake_chrome_user_manager.*
files look like code moves and not like completely new files.

[merkulova, 2015/01/21 14:10:33]

Donne. Used 40

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_CHROME_USER_MANAGER_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_CHROME_USER_MANAGER_H_
+
+#include <map>
+#include <string>
+
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/chromeos/login/user_flow.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager_interface.h"
+#include "components/user_manager/fake_user_manager.h"
+#include "components/user_manager/user.h"
+#include "components/user_manager/user_image/user_image.h"
+#include "components/user_manager/user_manager_base.h"
+
+namespace chromeos {
+
+class FakeSupervisedUserManager;
+
+// Fake chrome user manager with a barebones implementation. Users can be added
+// and set as logged in, and those users can be returned.
+class FakeChromeUserManager : public user_manager::FakeUserManager,
+                              public ChromeUserManagerInterface {
+ public:
+  FakeChromeUserManager();
+  virtual ~FakeChromeUserManager();

[ygorshenin1, 2015/01/20 18:33:40]

Modern fancy approach is to write:
~FakeChromeUserManager() override;

[merkulova, 2015/01/21 14:10:33]

Done.

+
+  // Create and add a new user.
+  virtual const user_manager::User* AddUser(const std::string& email) override;

[ygorshenin1, 2015/01/20 18:33:40]

Add a comment describing from which class this method is overridden?

[merkulova, 2015/01/21 14:10:33]

Done.

+
+  // Create and add a kiosk app user.

[ygorshenin1, 2015/01/20 18:33:40]

Could you please move non-virtual methods above or below overridden?

[merkulova, 2015/01/21 14:10:33]

Done.

+  void AddKioskAppUser(const std::string& kiosk_app_username);
+
+  // Create and add a public account user.
+  const user_manager::User* AddPublicAccountUser(const std::string& email);
+
+  // Calculates the user name hash and calls UserLoggedIn to login a user.
+  void LoginUser(const std::string& email);
+
+  // UserManager overrides.
+  user_manager::UserList GetUsersAllowedForMultiProfile() const override;
+
+  // ChromeUserManagerInterface implementation.
+  virtual MultiProfileUserController* GetMultiProfileUserController() override;

[ygorshenin1, 2015/01/20 18:33:40]

Could you please remove virtual keyboard for all methods with override
specifier?

[merkulova, 2015/01/21 14:10:33]

Done.

+  virtual UserImageManager* GetUserImageManager(
+      const std::string& user_id) override;
+  virtual SupervisedUserManager* GetSupervisedUserManager() override;
+  virtual void SetUserFlow(const std::string& email, UserFlow* flow) override {}
+  virtual UserFlow* GetCurrentUserFlow() const override;
+  virtual UserFlow* GetUserFlow(const std::string& email) const override;
+  virtual void ResetUserFlow(const std::string& email) override {}
+  virtual user_manager::UserList GetUsersAllowedForSupervisedUsersCreation()
+      const override;
+  virtual void SwitchActiveUser(const std::string& email) override;
+  virtual const std::string& GetOwnerEmail() const override;
+  virtual void SessionStarted() override {}
+  virtual void RemoveUser(const std::string& email,
+                          user_manager::RemoveUserDelegate* delegate) override {

[ygorshenin1, 2015/01/20 18:33:40]

Virtual methods are considered to be non-lightweight, so don't inline them. The
same for other methods.

[merkulova, 2015/01/21 14:10:34]

Done.

+  }
+
+  void set_owner_email(const std::string& owner_email) {
+    owner_email_ = owner_email;
+  }
+
+  void set_multi_profile_user_controller(
+      MultiProfileUserController* controller) {
+    multi_profile_user_controller_ = controller;
+  }
+
+ private:
+  scoped_ptr<FakeSupervisedUserManager> supervised_user_manager_;
+  std::string owner_email_;
+
+  MultiProfileUserController* multi_profile_user_controller_;
+
+  DISALLOW_COPY_AND_ASSIGN(FakeChromeUserManager);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_CHROME_USER_MANAGER_H_