Move card unmask interfaces and controller into the autofill component.

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

 // Copyright 2014 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/card_unmask_prompt_view_android.h"
 
 #include "chrome/browser/android/resource_mapper.h"
-#include "chrome/browser/ui/autofill/card_unmask_prompt_controller.h"
+#include "chrome/browser/ui/autofill/create_card_unmask_prompt_view.h"
+#include "components/autofill/core/browser/ui/card_unmask_prompt_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/CardUnmaskBridge_jni.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
 
 namespace autofill {
 
-CardUnmaskPromptView* CardUnmaskPromptView::CreateAndShow(
-    CardUnmaskPromptController* controller) {
-  CardUnmaskPromptViewAndroid* view =
-      new CardUnmaskPromptViewAndroid(controller);
-  view->Show();
-  return view;
+CardUnmaskPromptView* CreateCardUnmaskPromptView(
+    CardUnmaskPromptController* controller,
+    content::WebContents* web_contents) {
+  return new CardUnmaskPromptViewAndroid(controller, web_contents);
 }
 
 CardUnmaskPromptViewAndroid::CardUnmaskPromptViewAndroid(
-    CardUnmaskPromptController* controller)
-    : controller_(controller) {
+    CardUnmaskPromptController* controller,
+    content::WebContents* web_contents)
+    : controller_(controller), web_contents_(web_contents) {
 }
 
 CardUnmaskPromptViewAndroid::~CardUnmaskPromptViewAndroid() {
   if (controller_)
     controller_->OnUnmaskDialogClosed();
 }
 
 void CardUnmaskPromptViewAndroid::Show() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  ui::ViewAndroid* view_android =
-      controller_->GetWebContents()->GetNativeView();
+  ui::ViewAndroid* view_android = web_contents_->GetNativeView();
 
   ScopedJavaLocalRef<jstring> dialog_title =
       base::android::ConvertUTF16ToJavaString(env,
                                               controller_->GetWindowTitle());
   ScopedJavaLocalRef<jstring> instructions =
       base::android::ConvertUTF16ToJavaString(
           env, controller_->GetInstructionsMessage());
   java_object_.Reset(Java_CardUnmaskBridge_create(
       env, reinterpret_cast<intptr_t>(this), dialog_title.obj(),
       instructions.obj(),
@@ skipping 52 matching lines @@
   Java_CardUnmaskBridge_verificationFinished(env, java_object_.obj(),
                                              message.obj(), allow_retry);
 }
 
 // static
 bool CardUnmaskPromptViewAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace autofill