[Profile creation] Fix a broken DCHECK

A previous CL introduced a DCHECK on identity_manager_observation_ in
ProfilePickerView::OnProfileNameAvailable(). This CL fixes the DCHECK
by an early return in OnExtendedAccountInfoTimeout(). Without this
early return, OnProfileNameAvailable() got called mostly twice,
violating the DCHECK.

Bug: 1126913
Change-Id: Ie1a5457e16cea57a281c83abf005d4b6def9ea47
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2592788Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Jan Krcal <jkrcal@chromium.org>
Auto-Submit: Jan Krcal <jkrcal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837065}

chrome/browser/ui/views/profiles/profile_picker_view.cc

@@ -537,10 +537,13 @@ void ProfilePickerView::OnRefreshTokenUpdatedForAccount(
   ShowScreen(new_profile_contents_.get(), GURL(url::kAboutBlankURL),
              /*show_toolbar=*/true);
 
-  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
-      FROM_HERE,
+  // Set up a timeout for extended account info (which cancels any existing
+  // timeout closure).
+  extended_account_info_timeout_closure_.Reset(
       base::BindOnce(&ProfilePickerView::OnExtendedAccountInfoTimeout,
-                     weak_ptr_factory_.GetWeakPtr(), account_info.email),
+                     weak_ptr_factory_.GetWeakPtr(), account_info.email));
+  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+      FROM_HERE, extended_account_info_timeout_closure_.callback(),
       extended_account_info_timeout_);
 
   // DiceTurnSyncOnHelper deletes itself once done.
@@ -565,6 +568,8 @@ void ProfilePickerView::OnExtendedAccountInfoUpdated(
   name_for_signed_in_profile_ =
       profiles::GetDefaultNameForNewSignedInProfile(account_info);
   OnProfileNameAvailable();
+  // Extended info arrived on time, no need for the timeout callback any more.
+  extended_account_info_timeout_closure_.Cancel();
 }
 
 void ProfilePickerView::SetExtendedAccountInfoTimeoutForTesting(

chrome/browser/ui/views/profiles/profile_picker_view.h

@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_PICKER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_PICKER_VIEW_H_
 
+#include "base/cancelable_callback.h"
 #include "base/time/time.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/profile_picker.h"
@@ -173,6 +174,7 @@ class ProfilePickerView : public views::DialogDelegateView,
   base::string16 name_for_signed_in_profile_;
   base::OnceClosure on_profile_name_available_;
   base::TimeDelta extended_account_info_timeout_;
+  base::CancelableOnceClosure extended_account_info_timeout_closure_;
 
   // Not null iff switching to sign-in is in progress.
   base::OnceCallback<void(bool)> switch_finished_callback_;