Abstract WebContentsObserver from Autofill shared code

android_webview/native/aw_contents.cc

Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 9fd0edd64a5a6089fb4c615604049e92e52fdd01..d064fc3e1605a30702b8d5bade0e6ab7abb41a4b 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -28,9 +28,9 @@
 #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"
@@ -48,7 +48,7 @@
 struct AwDrawSWFunctionTable;
 struct AwDrawGLFunctionTable;
 
-using autofill::AutofillExternalDelegate;
+using autofill::AutofillDriverImpl;
 using autofill::AutofillManager;
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
@@ -164,7 +164,7 @@ 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();
@@ -178,22 +178,16 @@ void AwContents::InitAutofillIfNecessary(bool 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) {