Clear user session flags before restarting Chrome for guest mode

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/chromeos/login/login_utils.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 60 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/cryptohome_util.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #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"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
@@ skipping 104 matching lines @@
       bool has_active_session,
       LoginUtils::Delegate* delegate) OVERRIDE;
   virtual void DelegateDeleted(LoginUtils::Delegate* delegate) OVERRIDE;
   virtual void CompleteOffTheRecordLogin(const GURL& start_url) OVERRIDE;
   virtual scoped_refptr<Authenticator> CreateAuthenticator(
       AuthStatusConsumer* consumer) OVERRIDE;
   virtual bool RestartToApplyPerSessionFlagsIfNeed(Profile* profile,
                                                    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,
                                LoginDisplayHost* login_host,
                                bool locale_pref_checked);
 
   static void RunCallbackOnLocaleLoaded(
       const base::Closure& callback,
       InputEventsBlocker* input_events_blocker,
       const std::string& locale,
@@ skipping 197 matching lines @@
   // For guest session we ask session manager to restart Chrome with --bwsi
   // flag. We keep only some of the arguments of this process.
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   CommandLine command_line(browser_command_line.GetProgram());
   std::string cmd_line_str =
       GetOffTheRecordCommandLine(start_url,
                                  StartupUtils::IsOobeCompleted(),
                                  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);
 }
 
 scoped_refptr<Authenticator> LoginUtilsImpl::CreateAuthenticator(
     AuthStatusConsumer* consumer) {
   // Screen locker needs new Authenticator instance each time.
   if (ScreenLocker::default_screen_locker()) {
     if (authenticator_.get())
       authenticator_->SetConsumer(NULL);
     authenticator_ = NULL;
@@ skipping 73 matching lines @@
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = false;
   cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
   if (allow_new_user)
     return true;
   return cros_settings->FindEmailInList(
       kAccountsPrefUsers, username, wildcard_match);
 }
 
 }  // namespace chromeos