[Autofill] Move functions from the AutofillPopupController to AutofillPopupLayoutModel

chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc

 // Copyright (c) 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/ui/android/autofill/autofill_keyboard_accessory_view.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/ui/android/view_android_helper.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
+#include "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "grit/components_strings.h"
 #include "jni/AutofillKeyboardAccessoryBridge_jni.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace autofill {
 
 namespace {
 
 void AddToJavaArray(const Suggestion& suggestion,
-                    const AutofillPopupController& controller,
+                    int icon_id,
                     JNIEnv* env,
                     jobjectArray data_array,
                     size_t position,
                     bool deletable) {
   int android_icon_id = 0;
-  if (!suggestion.icon.empty()) {
-    android_icon_id = ResourceMapper::MapFromChromiumId(
-        controller.GetIconResourceID(suggestion.icon));
-  }
+  if (!suggestion.icon.empty())
+    android_icon_id = ResourceMapper::MapFromChromiumId(icon_id);
 
   Java_AutofillKeyboardAccessoryBridge_addToAutofillSuggestionArray(
       env, data_array, position,
       base::android::ConvertUTF16ToJavaString(env, suggestion.value).obj(),
       base::android::ConvertUTF16ToJavaString(env, suggestion.label).obj(),
       android_icon_id, suggestion.frontend_id, deletable);
 }
 
 }  // namespace
 
 AutofillKeyboardAccessoryView::AutofillKeyboardAccessoryView(
     AutofillPopupController* controller)
-    : controller_(controller),
-      deleting_index_(-1) {
+    : controller_(controller), deleting_index_(-1) {
   JNIEnv* env = base::android::AttachCurrentThread();
   java_object_.Reset(Java_AutofillKeyboardAccessoryBridge_create(env));
 }
 
 AutofillKeyboardAccessoryView::~AutofillKeyboardAccessoryView() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_AutofillKeyboardAccessoryBridge_resetNativeViewPointer(
       env, java_object_.obj());
 }
 
@@ skipping 21 matching lines @@
   ScopedJavaLocalRef<jobjectArray> data_array =
       Java_AutofillKeyboardAccessoryBridge_createAutofillSuggestionArray(env,
                                                                          count);
   positions_.resize(count);
   size_t position = 0;
 
   // Place "CLEAR FORM" item first in the list.
   for (size_t i = 0; i < count; ++i) {
     const Suggestion& suggestion = controller_->GetSuggestionAt(i);
     if (suggestion.frontend_id == POPUP_ITEM_ID_CLEAR_FORM) {
-      AddToJavaArray(suggestion, *controller_, env, data_array.obj(), position,
-                     false);
+      AddToJavaArray(suggestion, controller_->layout_model().GetIconResourceID(
+                                     suggestion.icon),
+                     env, data_array.obj(), position, false);
       positions_[position++] = i;
     }
   }
 
   for (size_t i = 0; i < count; ++i) {
     const Suggestion& suggestion = controller_->GetSuggestionAt(i);
     if (suggestion.frontend_id != POPUP_ITEM_ID_CLEAR_FORM) {
       bool deletable =
           controller_->GetRemovalConfirmationText(i, nullptr, nullptr);
-      AddToJavaArray(suggestion, *controller_, env, data_array.obj(), position,
-                     deletable);
+      AddToJavaArray(suggestion, controller_->layout_model().GetIconResourceID(
+                                     suggestion.icon),
+                     env, data_array.obj(), position, deletable);
       positions_[position++] = i;
     }
   }
 
   Java_AutofillKeyboardAccessoryBridge_show(
       env, java_object_.obj(), data_array.obj(), controller_->IsRTL());
 }
 
 void AutofillKeyboardAccessoryView::SuggestionSelected(
     JNIEnv* env,
@@ skipping 46 matching lines @@
 void AutofillKeyboardAccessoryView::InvalidateRow(size_t) {
 }
 
 // static
 bool AutofillKeyboardAccessoryView::RegisterAutofillKeyboardAccessoryView(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace autofill