[Smart Lock] Account chooser assign correct avatar to profile.

chrome/browser/password_manager/account_chooser_dialog_android.cc

 // Copyright 2015 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/password_manager/account_chooser_dialog_android.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 72 matching lines @@
                                            const SkBitmap* bitmap) {
   if (bitmap) {
     base::android::ScopedJavaLocalRef<jobject> java_bitmap =
         gfx::ConvertToJavaBitmap(bitmap);
     Java_AccountChooserDialog_imageFetchComplete(
         AttachCurrentThread(), java_dialog_, index_, java_bitmap);
   }
   delete this;
 }
 
-void FetchAvatars(
-    const base::android::ScopedJavaGlobalRef<jobject>& java_dialog,
-    const std::vector<std::unique_ptr<autofill::PasswordForm>>& password_forms,
-    int index,
-    net::URLRequestContextGetter* request_context) {
-  for (const auto& password_form : password_forms) {
-    if (!password_form->icon_url.is_valid())
-      continue;
-    // Fetcher deletes itself once fetching is finished.
-    auto* fetcher =
-        new AvatarFetcherAndroid(password_form->icon_url, index, java_dialog);
-    fetcher->Start(request_context);
-    ++index;
-  }
+void FetchAvatar(const base::android::ScopedJavaGlobalRef<jobject>& java_dialog,
+                 const autofill::PasswordForm* password_form,
+                 int index,
+                 net::URLRequestContextGetter* request_context) {
+  if (!password_form->icon_url.is_valid())
+    return;
+  // Fetcher deletes itself once fetching is finished.
+  auto* fetcher =
+      new AvatarFetcherAndroid(password_form->icon_url, index, java_dialog);
+  fetcher->Start(request_context);
 }
 
 };  // namespace
 
 AccountChooserDialogAndroid::AccountChooserDialogAndroid(
     content::WebContents* web_contents,
     std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials,
     std::vector<std::unique_ptr<autofill::PasswordForm>> federated_credentials,
     const GURL& origin,
     const ManagePasswordsState::CredentialsCallback& callback)
@@ skipping 42 matching lines @@
   dialog_jobject_.Reset(Java_AccountChooserDialog_createAndShowAccountChooser(
       env, native_window->GetJavaObject(), reinterpret_cast<intptr_t>(this),
       java_credentials_array,
       base::android::ConvertUTF16ToJavaString(env, title),
       title_link_range.start(), title_link_range.end(),
       base::android::ConvertUTF8ToJavaString(env, origin),
       base::android::ConvertUTF16ToJavaString(env, signin_button)));
   net::URLRequestContextGetter* request_context =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext())
           ->GetRequestContext();
-  FetchAvatars(dialog_jobject_, local_credentials_forms(), 0, request_context);
-  FetchAvatars(dialog_jobject_, federation_providers_forms(),
-               local_credentials_forms().size(), request_context);
+  int avatar_index = 0;
+  for (const auto& form : local_credentials_forms())
+    FetchAvatar(dialog_jobject_, form.get(), avatar_index++, request_context);
+  for (const auto& form : federation_providers_forms())
+    FetchAvatar(dialog_jobject_, form.get(), avatar_index++, request_context);
 }
 
 void AccountChooserDialogAndroid::OnCredentialClicked(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint credential_item,
     jint credential_type,
     jboolean signin_button_clicked) {
   ChooseCredential(
       credential_item,
@@ skipping 76 matching lines @@
         action);
   } else {
     password_manager::metrics_util::LogAccountChooserUserActionManyAccounts(
         action);
   }
 }
 
 bool RegisterAccountChooserDialogAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }