Pre- and Auto-login should not log the user out of an already signed in

chrome/browser/ui/autologin_infobar_delegate.cc

 // Copyright (c) 2011 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/ui/autologin_infobar_delegate.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_split.h"
@@ skipping 34 matching lines @@
   AutoLoginRedirector(TabContentsWrapper* tab_contents_wrapper,
                       const std::string& args);
   virtual ~AutoLoginRedirector();
 
  private:
   // NotificationObserver override.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
-  // Redirect tab to TokenAuth URL, logging the user in and navigating
+  // Redirect tab to MergeSession URL, logging the user in and navigating
   // to the desired page.
-  void RedirectToTokenAuth(const std::string& token);
+  void RedirectToMergeSession(const std::string& token);
 
   TabContentsWrapper* tab_contents_wrapper_;
   const std::string args_;
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoLoginRedirector);
 };
 
 AutoLoginRedirector::AutoLoginRedirector(
     TabContentsWrapper* tab_contents_wrapper, const std::string& args)
@@ skipping 20 matching lines @@
                                   const NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_TOKEN_AVAILABLE ||
          type == chrome::NOTIFICATION_TOKEN_REQUEST_FAILED);
 
   // We are only interested in GAIA tokens.
   if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
     TokenService::TokenAvailableDetails* tok_details =
         Details<TokenService::TokenAvailableDetails>(details).ptr();
 
     if (tok_details->service() == GaiaConstants::kGaiaService) {
-      RedirectToTokenAuth(tok_details->token());
+      RedirectToMergeSession(tok_details->token());
       delete this;
       return;
     }
   } else {
     TokenService::TokenRequestFailedDetails* tok_details =
         Details<TokenService::TokenRequestFailedDetails>(details).ptr();
 
     if (tok_details->service() == GaiaConstants::kGaiaService) {
       LOG(WARNING) << "AutoLoginRedirector: token request failed";
       delete this;
       return;
     }
   }
 }
 
-void AutoLoginRedirector::RedirectToTokenAuth(const std::string& token) {
+void AutoLoginRedirector::RedirectToMergeSession(const std::string& token) {
   // The args are URL encoded, so we need to decode them before use.
   url_canon::RawCanonOutputT<char16> output;
   url_util::DecodeURLEscapeSequences(args_.c_str(), args_.length(), &output);
   std::string unescaped_args;
   UTF16ToUTF8(output.data(), output.length(), &unescaped_args);
 
   const char kUrlFormat[] = "%s?"
                             "source=chrome&"
-                            "auth=%s&"
+                            "uberauth=%s&"
                             "%s";
-  const std::string url_string = GaiaUrls::GetInstance()->token_auth_url();
+  const std::string url_string = GaiaUrls::GetInstance()->merge_session_url();
   std::string url = base::StringPrintf(kUrlFormat,
                                        url_string.c_str(),
                                        token.c_str(),
                                        unescaped_args.c_str());
 
   // TODO(rogerta): what is the correct page transition?
   tab_contents_wrapper_->tab_contents()->controller().LoadURL(GURL(url),
       GURL(), PageTransition::AUTO_BOOKMARK);
 }
 
@@ skipping 148 matching lines @@
   new AutoLoginRedirector(tab_contents_wrapper_, args_);
   return true;
 }
 
 bool AutoLoginInfoBarDelegate::Cancel() {
   PrefService* user_prefs = tab_contents_wrapper_->profile()->GetPrefs();
   user_prefs->SetBoolean(prefs::kAutologinEnabled, false);
   user_prefs->ScheduleSavePersistentPrefs();
   return true;
 }