Reauth causes a MergeSession, so the cookie jar gets re-authed too.

chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

 // Copyright 2013 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/webui/signin/inline_login_handler_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 30 matching lines @@
 #include "content/public/browser/web_ui.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
 
 namespace {
 
-class InlineSigninHelper : public GaiaAuthConsumer {
+class InlineSigninHelper : public GaiaAuthConsumer,
+                           public MergeSessionHelper::Observer {
  public:
   InlineSigninHelper(
       base::WeakPtr<InlineLoginHandlerImpl> handler,
       net::URLRequestContextGetter* getter,
       Profile* profile,
       const GURL& current_url,
       const std::string& email,
       const std::string& gaia_id,
       const std::string& password,
       const std::string& session_index,
       const std::string& signin_scoped_device_id,
       bool choose_what_to_sync,
       bool confirm_untrusted_signin);
 
  private:
   // Overridden from GaiaAuthConsumer.
   void OnClientOAuthSuccess(const ClientOAuthResult& result) override;
   void OnClientOAuthFailure(const GoogleServiceAuthError& error)
       override;
 
+  // Overridden from MergeSessionHelper::Observer.
+  void MergeSessionCompleted(const std::string& account_id,
+                             const GoogleServiceAuthError& error) override;
+
   GaiaAuthFetcher gaia_auth_fetcher_;
   base::WeakPtr<InlineLoginHandlerImpl> handler_;
   Profile* profile_;
   GURL current_url_;
   std::string email_;
   std::string gaia_id_;
   std::string password_;
   std::string session_index_;
   bool choose_what_to_sync_;
   bool confirm_untrusted_signin_;
+  // Helper to merge signed in account into the content area.
+  scoped_ptr<MergeSessionHelper> merge_session_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(InlineSigninHelper);
 };
 
 InlineSigninHelper::InlineSigninHelper(
     base::WeakPtr<InlineLoginHandlerImpl> handler,
     net::URLRequestContextGetter* getter,
     Profile* profile,
     const GURL& current_url,
     const std::string& email,
@@ skipping 46 matching lines @@
   if (gaia::AreEmailsSame(email_, primary_email) &&
       source == signin_metrics::SOURCE_REAUTH &&
       switches::IsNewProfileManagement() &&
       !password_.empty() &&
       profiles::IsLockAvailable(profile_)) {
     LocalAuth::SetLocalAuthCredentials(profile_, password_);
   }
 
   if (source == signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT ||
       source == signin_metrics::SOURCE_REAUTH) {
-    ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->
-        UpdateCredentials(account_id, result.refresh_token);
+    ProfileOAuth2TokenService* token_service =
+        ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
+    token_service->UpdateCredentials(account_id, result.refresh_token);
 
     if (signin::IsAutoCloseEnabledInURL(current_url_)) {
       // Close the gaia sign in tab via a task to make sure we aren't in the
       // middle of any webui handler code.
       base::MessageLoop::current()->PostTask(
           FROM_HERE,
           base::Bind(&InlineLoginHandlerImpl::CloseTab,
           handler_,
           signin::ShouldShowAccountManagement(current_url_)));
     }
+
+    SigninClient* signin_client =
+        ChromeSigninClientFactory::GetForProfile(profile_);
+    if (signin_client->ShouldMergeSigninCredentialsIntoCookieJar()) {
+        merge_session_helper_.reset(new MergeSessionHelper(
+            token_service, GaiaConstants::kChromeSource,
+            signin_client->GetURLRequestContext(), NULL));
+        merge_session_helper_->LogIn(account_id);
+    } else {
+      base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+    }

[Roger Tawa OOO till Jul 10th, 2015/02/12 14:54:38]

As discussed offline, it would be better to refactor the signin manager code and
expose a method to perform the merge session instead of using a second instance
of merge_session_helper_ here.

[Mike Lerman, 2015/02/13 19:17:06]

Done.

   } else {
     ProfileSyncService* sync_service =
         ProfileSyncServiceFactory::GetForProfile(profile_);
     SigninErrorController* error_controller =
         SigninErrorControllerFactory::GetForProfile(profile_);
 
     bool is_new_avatar_menu = switches::IsNewAvatarMenu();
 
     OneClickSigninSyncStarter::StartSyncMode start_mode;
     if (source == signin_metrics::SOURCE_SETTINGS || choose_what_to_sync_) {
@@ skipping 37 matching lines @@
       // OneClickSigninSyncStarter will delete itself once the job is done.
       new OneClickSigninSyncStarter(
           profile_, browser,
           email_, password_, result.refresh_token,
           start_mode,
           contents,
           confirmation_required,
           signin::GetNextPageURLForPromoURL(current_url_),
           base::Bind(&InlineLoginHandlerImpl::SyncStarterCallback, handler_));
     }
+    base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   }
-
-  base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void InlineSigninHelper::OnClientOAuthFailure(
   const GoogleServiceAuthError& error) {
   if (handler_)
     handler_->HandleLoginError(error.ToString());
 
   AboutSigninInternals* about_signin_internals =
     AboutSigninInternalsFactory::GetForProfile(profile_);
   about_signin_internals->OnRefreshTokenReceived("Failure");
 
   base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
+void InlineSigninHelper::MergeSessionCompleted(
+    const std::string& account_id,
+    const GoogleServiceAuthError& error) {
+  base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+}
+
 }  // namespace
 
 InlineLoginHandlerImpl::InlineLoginHandlerImpl()
       : confirm_untrusted_signin_(false),
         weak_factory_(this) {
 }
 
 InlineLoginHandlerImpl::~InlineLoginHandlerImpl() {}
 
 // This method is not called with webview sign in enabled.
@@ skipping 213 matching lines @@
       }
     }
 
     if (show_account_management) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
             BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
             signin::ManageAccountsParams());
     }
   }
 }