Fix the bug which is login dialog won't close after the second sign-in to chrome with different acc…

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 <stddef.h>
 
 #include <string>
 #include <vector>
@@ skipping 102 matching lines @@
 void CloseModalSigninIfNeeded(InlineLoginHandlerImpl* handler) {
   if (handler && switches::UsePasswordSeparatedSigninFlow()) {
     Browser* browser = handler->GetDesktopBrowser();
     if (browser)
       browser->CloseModalSigninWindow();
   }
 }
 
 void UnlockProfileAndHideLoginUI(const base::FilePath profile_path,
                                  InlineLoginHandlerImpl* handler) {
-  ProfileManager* profile_manager = g_browser_process->profile_manager();
-  if (profile_manager) {
-    ProfileAttributesEntry* entry;
-    if (profile_manager->GetProfileAttributesStorage()
-            .GetProfileAttributesWithPath(profile_path, &entry)) {
-      entry->SetIsSigninRequired(false);
+  if (!profile_path.empty()) {

[anthonyvd, 2016/11/28 12:36:13]

This should only be the case when sign in happens from the User Manager,
correct?

+    ProfileManager* profile_manager = g_browser_process->profile_manager();
+    if (profile_manager) {
+      ProfileAttributesEntry* entry;
+      if (profile_manager->GetProfileAttributesStorage()
+              .GetProfileAttributesWithPath(profile_path, &entry)) {
+        entry->SetIsSigninRequired(false);
+      }
     }
   }
   if (handler)
     handler->web_ui()->CallJavascriptFunctionUnsafe("inline.login.closeDialog");
   UserManager::Hide();
 }
 
 bool IsCrossAccountError(Profile* profile,
                          const std::string& email,
                          const std::string& gaia_id) {
@@ skipping 650 matching lines @@
 
   // InlineSigninHelper will delete itself.
   new InlineSigninHelper(
       handler_weak_ptr, params.partition->GetURLRequestContext(), profile,
       status, params.url, params.email, params.gaia_id, params.password,
       params.session_index, params.auth_code, signin_scoped_device_id,
       params.choose_what_to_sync, params.confirm_untrusted_signin);
 
   // If opened from user manager to unlock a profile, make sure the user manager
   // is closed and that the profile is marked as unlocked.
-  if (!params.profile_path.empty() && !signin::IsForceSigninEnabled()) {
+  if (!signin::IsForceSigninEnabled()) {
     UnlockProfileAndHideLoginUI(params.profile_path, params.handler);
   }
 }
 
 void InlineLoginHandlerImpl::HandleLoginError(const std::string& error_msg,
                                               const base::string16& email) {
   SyncStarterCallback(OneClickSigninSyncStarter::SYNC_SETUP_FAILURE);
   Browser* browser = GetDesktopBrowser();
   Profile* profile = Profile::FromWebUI(web_ui());
 
@@ skipping 58 matching lines @@
     }
 
     if (show_account_management) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
           BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
           signin::ManageAccountsParams(),
           signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN);
     }
   }
 }