Abstract WebContentsObserver from Autofill shared code

android_webview/native/aw_contents.cc

 // Copyright 2012 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 "android_webview/native/aw_contents.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/gpu_memory_buffer_impl.h"
 #include "android_webview/browser/in_process_view_renderer.h"
@@ skipping 10 matching lines @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/pickle.h"
 #include "base/strings/string16.h"
 #include "base/supports_user_data.h"
-#include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/content/browser/autofill_driver_impl.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "jni/AwContents_jni.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 struct AwDrawSWFunctionTable;
 struct AwDrawGLFunctionTable;
 
-using autofill::AutofillExternalDelegate;
+using autofill::AutofillDriverImpl;
 using autofill::AutofillManager;
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using navigation_interception::InterceptNavigationDelegate;
@@ skipping 95 matching lines @@
       AwBrowserContext::FromWebContents(web_contents_.get())->
           AutofillManagerDelegate();
   if (autofill_manager_delegate)
     InitAutofillIfNecessary(autofill_manager_delegate->GetSaveFormData());
 }
 
 void AwContents::SetSaveFormData(bool enabled) {
   InitAutofillIfNecessary(enabled);
   // We need to check for the existence, since autofill_manager_delegate
   // may not be created when the setting is false.
-  if (AutofillManager::FromWebContents(web_contents_.get())) {
+  if (AutofillDriverImpl::FromWebContents(web_contents_.get())) {
     AwAutofillManagerDelegate* autofill_manager_delegate =
         AwBrowserContext::FromWebContents(web_contents_.get())->
             AutofillManagerDelegate();
     autofill_manager_delegate->SetSaveFormData(enabled);
   }
 }
 
 void AwContents::InitAutofillIfNecessary(bool enabled) {
   // Do not initialize if the feature is not enabled.
   if (!enabled)
     return;
   // Check if the autofill manager already exists.
   content::WebContents* web_contents = web_contents_.get();
-  if (AutofillManager::FromWebContents(web_contents))
+  if (AutofillDriverImpl::FromWebContents(web_contents))
     return;
 
-  AutofillManager::CreateForWebContentsAndDelegate(
+  AutofillDriverImpl::CreateForWebContentsAndDelegate(
       web_contents,
       AwBrowserContext::FromWebContents(web_contents)->
           CreateAutofillManagerDelegate(enabled),
       l10n_util::GetDefaultLocale(),
-      AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER);
-  AutofillManager* autofill_manager =
-      AutofillManager::FromWebContents(web_contents);
-  AutofillExternalDelegate::CreateForWebContentsAndManager(
-      web_contents,
-      autofill_manager);
-  autofill_manager->SetExternalDelegate(
-      AutofillExternalDelegate::FromWebContents(web_contents));
+      AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER,
+      true);
 }
 
 void AwContents::SetWebContents(JNIEnv* env, jobject obj, jint new_wc) {
   SetWebContents(reinterpret_cast<content::WebContents*>(new_wc));
 }
 
 AwContents::~AwContents() {
   DCHECK(AwContents::FromWebContents(web_contents_.get()) == this);
   web_contents_->RemoveUserData(kAwContentsUserDataKey);
   if (find_helper_.get())
@@ skipping 503 matching lines @@
   return browser_view_renderer_->CapturePicture();
 }
 
 void AwContents::EnableOnNewPicture(JNIEnv* env,
                                     jobject obj,
                                     jboolean enabled) {
   browser_view_renderer_->EnableOnNewPicture(enabled);
 }
 
 }  // namespace android_webview