Clear user session flags before restarting Chrome for guest mode

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 80c76fa43b4ffec72bc79d40a387acc68f44f043..5904b159c6ab4adaf2b6ecfd1d94658771e19ef5 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -78,6 +78,7 @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/auth/user_context.h"
+#include "chromeos/login/user_names.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/user_manager/user.h"
@@ -202,10 +203,10 @@ class LoginUtilsImpl : public LoginUtils,
                                                    bool early_restart) OVERRIDE;
 
   // UserSessionManager::Delegate implementation:
-   virtual void OnProfilePrepared(Profile* profile) OVERRIDE;
- #if defined(ENABLE_RLZ)
-   virtual void OnRlzInitialized() OVERRIDE;
- #endif
+  virtual void OnProfilePrepared(Profile* profile) OVERRIDE;
+#if defined(ENABLE_RLZ)
+  virtual void OnRlzInitialized() OVERRIDE;
+#endif
 
  private:
   void DoBrowserLaunchInternal(Profile* profile,
@@ -423,6 +424,9 @@ void LoginUtilsImpl::CompleteOffTheRecordLogin(const GURL& start_url) {
                                  browser_command_line,
                                  &command_line);
 
+  DBusThreadManager::Get()->GetSessionManagerClient()->SetFlagsForUser(

[Alexander Alekseev, 2014/10/02 12:34:51]

dpolukhin> Restarting browser twice for entering Guest mode is obvious
dpolukhin> wrong thing. So now I understand your patch that eliminates
dpolukhin> second restart. I think you should just update the comment
dpolukhin> what happens and good to go. It was really tricky issue!

Please add comment on what's happening here.

[tbarzic, 2014/10/02 20:23:55]

Done.

+      chromeos::login::kGuestUserName,
+      CommandLine::StringVector());
   RestartChrome(cmd_line_str);
 }