Introduce SessionManager that will contain code to start user session on Chrome OS

Introduce SessionManager that will contain code to start user session on Chrome OS

Move profile creation / session initialization (prefs/RLZ) as well as some of OAuth session init
related code from LoginUtils to SessionManager. LoginUtils will temporarily implement
SessionManager::Delegate interface till existing test coverage is migrated from LoginUtils interface.
SessionManager will later use concept of UserSession (see design proposal at http://goto/cros-login-c14n).

LoginUtils::OnPrepareProfile() is split into
StartSession()
--PreStartSession() - things like switching logging dest
--CreateUserSession() - will eventually create UserSession instance
--StartCrosSession() - notify cros::SessionManager
--NotifyUserLoggedIn() - UserManager::UserLoggedIn()
--PrepareProfile()

PrepareProfile() - calls PM::CreateProfileAsync()
--OnProfileCreated()
----InitProfilePreferences() - early initialization
----UserProfileInitialized()
------transfer signin profile auth date (cookies/proxy auth/certs)
------RestoreAuthSessionImpl() - OAuth2LoginManager::RestoreSession()
----FinalizePrepareProfile(()
------Own TPM (if it didn't happen for some reason)
------Notify SAML offline signin limiter
------Notify ProfileImpl
------chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED
------InitRLZ (for primary user)
  

Minor cleanup
* Unify DemoApp profile initialization flow with regular one
* Don't pass display_email to LoginUtils::PrepareProfile
* Move powerwash related prefs registration to ResetScreenHandler
* Cleanup M31 migration code for |prefs::kProfileIsManaged| in LoginUtilsImpl::InitProfilePreferences()

BUG=370175, 276163
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=276626

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=277238

[Nikita (slow), 2014-06-11 10:49:57]

Ready for review.

[Nikita (slow), 2014-06-11 15:03:59]

bauerb@ for chrome/browser/prefs/*

[Bernhard Bauer, 2014-06-11 15:17:09]

c/b/p/ LGTM with a nit:

https://codereview.chromium.org/318853004/diff/260001/chrome/browser/prefs/br...
File chrome/browser/prefs/browser_prefs.cc (right):

https://codereview.chromium.org/318853004/diff/260001/chrome/browser/prefs/br...
chrome/browser/prefs/browser_prefs.cc:300:
chromeos::SessionManager::RegisterPrefs(registry);
Move this down so it will stay sorted?

[Denis Kuznetsov (DE-MUC), 2014-06-11 15:38:51]

https://chromiumcodereview.appspot.com/318853004/diff/260001/chrome/browser/c...
File chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc (left):

https://chromiumcodereview.appspot.com/318853004/diff/260001/chrome/browser/c...
chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc:163: std::string(),  //
display email
nit: align comments?

https://chromiumcodereview.appspot.com/318853004/diff/260001/chrome/browser/c...
File chrome/browser/chromeos/login/session/session_manager.h (right):

https://chromiumcodereview.appspot.com/318853004/diff/260001/chrome/browser/c...
chrome/browser/chromeos/login/session/session_manager.h:58: void
StartSession(const UserContext& user_context,
nit:comment

[Denis Kuznetsov (DE-MUC), 2014-06-11 15:44:55]

lgtm

[Nikita (slow), 2014-06-11 15:54:50]

cc: zelidrag@, xiyuan@

[Nikita (slow), 2014-06-11 16:44:02]

https://chromiumcodereview.appspot.com/318853004/diff/260001/chrome/browser/c...
File chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc (left):

https://chromiumcodereview.appspot.com/318853004/diff/260001/chrome/browser/c...
chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc:163: std::string(),  //
display email
On 2014/06/11 15:38:50, Denis Kuznetsov wrote:
> nit: align comments?

they are aligned, since display email is now removed.

https://chromiumcodereview.appspot.com/318853004/diff/260001/chrome/browser/c...
File chrome/browser/chromeos/login/session/session_manager.h (right):

https://chromiumcodereview.appspot.com/318853004/diff/260001/chrome/browser/c...
chrome/browser/chromeos/login/session/session_manager.h:58: void
StartSession(const UserContext& user_context,
On 2014/06/11 15:38:50, Denis Kuznetsov wrote:
> nit:comment

Done.

[Nikita (slow), 2014-06-11 16:55:37]

The CQ bit was checked by nkostylev@chromium.org

[commit-bot: I haz the power, 2014-06-11 16:57:33]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/nkostylev@chromium.org/318853004/280001

[commit-bot: I haz the power, 2014-06-11 20:56:11]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  win_chromium_x64_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)

[commit-bot: I haz the power, 2014-06-11 21:25:07]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-11 21:25:08]

Try jobs failed on following builders:
  win_chromium_x64_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)

[Nikita (slow), 2014-06-11 21:42:49]

The CQ bit was checked by nkostylev@chromium.org

[commit-bot: I haz the power, 2014-06-11 21:44:56]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/nkostylev@chromium.org/318853004/280001

[commit-bot: I haz the power, 2014-06-11 21:49:47]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  win_chromium_x64_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)

[commit-bot: I haz the power, 2014-06-11 21:52:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-11 21:52:12]

Try jobs failed on following builders:
  win_chromium_x64_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)

[Nikita (slow), 2014-06-11 21:56:58]

The CQ bit was checked by nkostylev@chromium.org

[commit-bot: I haz the power, 2014-06-11 21:58:34]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/nkostylev@chromium.org/318853004/280001

[commit-bot: I haz the power, 2014-06-11 22:22:51]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  win_chromium_x64_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)

[commit-bot: I haz the power, 2014-06-11 22:25:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-11 22:25:11]

Try jobs failed on following builders:
  win_chromium_x64_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)

[Nikita (slow), 2014-06-12 05:47:40]

The CQ bit was checked by nkostylev@chromium.org

[commit-bot: I haz the power, 2014-06-12 05:51:31]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/nkostylev@chromium.org/318853004/280001

[commit-bot: I haz the power, 2014-06-12 11:14:58]

Change committed as 276626

[please use gerrit instead, 2014-06-12 17:55:37]

Did this break kiosk and auth browser tests in
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%2...
?

[please use gerrit instead, 2014-06-12 18:02:59]

A revert of this CL has been created in
https://codereview.chromium.org/328383003/ by rouslan@chromium.org.

The reason for reverting is: Appears to have broken the kiosk and auth browser
tests in
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%2....

[Nikita (slow), 2014-06-12 20:05:52]

On 2014/06/12 17:55:37, Rouslan Solomakhin wrote:
> Did this break kiosk and auth browser tests in
>
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%2...
> ?

It did not since this was broken by another CL:
http://src.chromium.org/viewvc/chrome?revision=276656&view=revision

This build which included revert of 276656 is green.
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%2...

Reverting revert.

[xiyuan, 2014-06-12 20:46:19]

emm... we need to property restore this CL.

The revert fails in chromeos build:
http://build.chromium.org/p/chromiumos.chromium/builders/Daisy%20%28chromium%...

chromeos-chrome-37.0.2047.0_alpha-r1:
../../../../../../../home/chrome-bot/chrome_root/src/chrome/browser/chromeos/login/login_utils.cc:462:41:
error: 'kManagedUserId' is not a member of 'prefs'
chromeos-chrome-37.0.2047.0_alpha-r1:     
user_profile->GetPrefs()->SetString(prefs::kManagedUserId,

kManagedUserId seems to be deleted now.

[please use gerrit instead, 2014-06-12 20:47:14]

On 2014/06/12 20:46:19, xiyuan wrote:
> emm... we need to property restore this CL.
> 
> The revert fails in chromeos build:
>
http://build.chromium.org/p/chromiumos.chromium/builders/Daisy%20%28chromium%...
> 
> chromeos-chrome-37.0.2047.0_alpha-r1:
>
../../../../../../../home/chrome-bot/chrome_root/src/chrome/browser/chromeos/login/login_utils.cc:462:41:
> error: 'kManagedUserId' is not a member of 'prefs'
> chromeos-chrome-37.0.2047.0_alpha-r1:     
> user_profile->GetPrefs()->SetString(prefs::kManagedUserId,
> 
> kManagedUserId seems to be deleted now.

Fixed in https://codereview.chromium.org/337573002/ : "Rename
prefs::kManagedUserId to prefs::kSupervisedUserId to fix compile."

[Nikita (slow), 2014-06-12 21:02:59]

The CQ bit was checked by nkostylev@chromium.org

[commit-bot: I haz the power, 2014-06-12 21:05:34]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/nkostylev@chromium.org/318853004/280001

[commit-bot: I haz the power, 2014-06-12 21:08:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-12 21:08:55]

Failed to apply patch for chrome/browser/chromeos/login/login_utils.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/chromeos/login/login_utils.cc
  Hunk #9 FAILED at 326.
  1 out of 12 hunks FAILED -- saving rejects to file
chrome/browser/chromeos/login/login_utils.cc.rej

Patch:       chrome/browser/chromeos/login/login_utils.cc
Index: chrome/browser/chromeos/login/login_utils.cc
diff --git a/chrome/browser/chromeos/login/login_utils.cc
b/chrome/browser/chromeos/login/login_utils.cc
index
71dd7ee199160371a03107710facc4b5e499053c..f5946418504d2da79c93a9e5e30a60878f3974fc
100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -21,7 +21,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_member.h"
-#include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -36,7 +35,6 @@
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
-#include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/login/auth/parallel_authenticator.h"
 #include "chrome/browser/chromeos/login/auth/user_context.h"
 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
@@ -45,6 +43,7 @@
 #include "chrome/browser/chromeos/login/profile_auth_data.h"
 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
 #include
"chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h"
+#include "chrome/browser/chromeos/login/session/session_manager.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ -76,7 +75,6 @@
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
-#include "chromeos/ime/input_method_manager.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
@@ -111,21 +109,14 @@ struct DoBrowserLaunchOnLocaleLoadedData;
 
 class LoginUtilsImpl
     : public LoginUtils,
-      public OAuth2LoginManager::Observer,
-      public net::NetworkChangeNotifier::ConnectionTypeObserver,
-      public base::SupportsWeakPtr<LoginUtilsImpl> {
+      public base::SupportsWeakPtr<LoginUtilsImpl>,
+      public SessionManager::Delegate {
  public:
   LoginUtilsImpl()
-      : has_web_auth_cookies_(false),
-        delegate_(NULL),
-        exit_after_session_restore_(false),
-        session_restore_strategy_(
-            OAuth2LoginManager::RESTORE_FROM_SAVED_OAUTH2_REFRESH_TOKEN) {
-    net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
+      : delegate_(NULL) {
   }
 
   virtual ~LoginUtilsImpl() {
-    net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
   }
 
   // LoginUtils implementation:
@@ -133,33 +124,23 @@ class LoginUtilsImpl
                                LoginDisplayHost* login_host) OVERRIDE;
   virtual void PrepareProfile(
       const UserContext& user_context,
-      const std::string& display_email,
       bool has_cookies,
       bool has_active_session,
       LoginUtils::Delegate* delegate) OVERRIDE;
   virtual void DelegateDeleted(LoginUtils::Delegate* delegate) OVERRIDE;
   virtual void CompleteOffTheRecordLogin(const GURL& start_url) OVERRIDE;
-  virtual void SetFirstLoginPrefs(PrefService* prefs) OVERRIDE;
   virtual scoped_refptr<Authenticator> CreateAuthenticator(
       LoginStatusConsumer* consumer) OVERRIDE;
-  virtual void RestoreAuthenticationSession(Profile* profile) OVERRIDE;
-  virtual void InitRlzDelayed(Profile* user_profile) OVERRIDE;
 
-  // OAuth2LoginManager::Observer overrides.
-  virtual void OnSessionRestoreStateChanged(
-      Profile* user_profile,
-      OAuth2LoginManager::SessionRestoreState state) OVERRIDE;
-  virtual void OnNewRefreshTokenAvaiable(Profile* user_profile) OVERRIDE;
-
-  // net::NetworkChangeNotifier::ConnectionTypeObserver overrides.
-  virtual void OnConnectionTypeChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+  // SessionManager::Delegate implementation:
+   virtual void OnProfilePrepared(Profile* profile) OVERRIDE;
+ #if defined(ENABLE_RLZ)
+   virtual void OnRlzInitialized() OVERRIDE;
+ #endif
 
  private:
-  typedef std::set<std::string> SessionRestoreStateSet;
-
   // DoBrowserLaunch is split into two parts.
-  // This one is called after anynchronous locale switch.
+  // This one is called after asynchronous locale switch.
   void DoBrowserLaunchOnLocaleLoadedImpl(Profile* profile,
                                          LoginDisplayHost* login_host);
 
@@ -170,79 +151,16 @@ class LoginUtilsImpl
       const std::string& loaded_locale,
       const bool success);
 
-  // Restarts OAuth session authentication check.
-  void KickStartAuthentication(Profile* profile);
-
-  // Callback for Profile::CREATE_STATUS_CREATED profile state.
-  // Initializes basic preferences for newly created profile. Any other
-  // early profile initialization that needs to happen before
-  // ProfileManager::DoFinalInit() gets called is done here.
-  void InitProfilePreferences(Profile* user_profile,
-                              const std::string& email);
-
-  // Callback for asynchronous profile creation.
-  void OnProfileCreated(const std::string& email,
-                        Profile* profile,
-                        Profile::CreateStatus status);
-
-  // Callback for asynchronous off the record profile creation.
-  void OnOTRProfileCreated(const std::string& email,
-                        Profile* profile,
-                        Profile::CreateStatus status);
-
-  // Callback for Profile::CREATE_STATUS_INITIALIZED profile state.
-  // Profile is created, extensions and promo resources are initialized.
-  void UserProfileInitialized(Profile* user_profile);
-
-  // Callback for Profile::CREATE_STATUS_INITIALIZED profile state for an OTR
-  // login.
-  void OTRProfileInitialized(Profile* user_profile);
-
-  // Callback to resume profile creation after transferring auth data from
-  // the authentication profile.
-  void CompleteProfileCreate(Profile* user_profile);
-
-  // Finalized profile preparation.
-  void FinalizePrepareProfile(Profile* user_profile);
-
-  // Initializes member variables needed for session restore process via
-  // OAuthLoginManager.
-  void InitSessionRestoreStrategy();
-
-  // Restores GAIA auth cookies for the created user profile from OAuth2 token.
-  void RestoreAuthSession(Profile* user_profile,
-                          bool restore_from_auth_cookies);
-
-  // Initializes RLZ. If |disabled| is true, RLZ pings are disabled.
-  void InitRlz(Profile* user_profile, bool disabled);
-
   // Attempts restarting the browser process and esures that this does
   // not happen while we are still fetching new OAuth refresh tokens.
   void AttemptRestart(Profile* profile);
 
-  UserContext user_context_;
-
-  // True if the authentication profile's cookie jar should contain
-  // authentication cookies from the authentication extension log in flow.
-  bool has_web_auth_cookies_;
   // Has to be scoped_refptr, see comment for CreateAuthenticator(...).
   scoped_refptr<Authenticator> authenticator_;
 
   // Delegate to be fired when the profile will be prepared.
   LoginUtils::Delegate* delegate_;
 
-  // Set of user_id for those users that we should restore authentication
-  // session when notified about online state change.
-  SessionRestoreStateSet pending_restore_sessions_;
-
-  // True if we should restart chrome right after session restore.
-  bool exit_after_session_restore_;
-
-  // Sesion restore strategy.
-  OAuth2LoginManager::SessionRestoreStrategy session_restore_strategy_;
-  // OAuth2 refresh token for session restore.
-  std::string oauth2_refresh_token_;
-
   DISALLOW_COPY_AND_ASSIGN(LoginUtilsImpl);
 };
 
@@ -385,57 +303,22 @@ void LoginUtilsImpl::DoBrowserLaunch(Profile* profile,
 
 void LoginUtilsImpl::PrepareProfile(
     const UserContext& user_context,
-    const std::string& display_email,
     bool has_cookies,
     bool has_active_session,
     LoginUtils::Delegate* delegate) {
-  BootTimesLoader* btl = BootTimesLoader::Get();
-
-  VLOG(1) << "Completing login for " << user_context.GetUserID();
-
-  if (!has_active_session) {
-    btl->AddLoginTimeMarker("StartSession-Start", false);
-    DBusThreadManager::Get()->GetSessionManagerClient()->StartSession(
-        user_context.GetUserID());
-    btl->AddLoginTimeMarker("StartSession-End", false);
-  }
-
-  btl->AddLoginTimeMarker("UserLoggedIn-Start", false);
-  UserManager* user_manager = UserManager::Get();
-  user_manager->UserLoggedIn(user_context.GetUserID(),
-                             user_context.GetUserIDHash(),
-                             false);
-  btl->AddLoginTimeMarker("UserLoggedIn-End", false);
-
-  // Switch log file as soon as possible.
-  if (base::SysInfo::IsRunningOnChromeOS())
-    logging::RedirectChromeLogging(*(CommandLine::ForCurrentProcess()));
-
-  // Update user's displayed email.
-  if (!display_email.empty())
-    user_manager->SaveUserDisplayEmail(user_context.GetUserID(),
display_email);
-
-  user_context_ = user_context;
-
-  has_web_auth_cookies_ = has_cookies;
+  // TODO(nkostylev): We have to initialize LoginUtils delegate as long
+  // as it coexist with SessionManager.
   delegate_ = delegate;
-  InitSessionRestoreStrategy();
-
-  if (DemoAppLauncher::IsDemoAppSession(user_context.GetUserID())) {
-    g_browser_process->profile_manager()->CreateProfileAsync(
-        use…
(message too large)

[Nikita (slow), 2014-06-13 22:17:00]

The CQ bit was checked by nkostylev@chromium.org

[commit-bot: I haz the power, 2014-06-13 22:19:15]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/nkostylev@chromium.org/318853004/300001

[commit-bot: I haz the power, 2014-06-14 19:21:25]

Change committed as 277238