Abstract WebContentsObserver from Autofill shared code

chrome/browser/autofill/autofill_browsertest.cc

Index: chrome/browser/autofill/autofill_browsertest.cc
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index 49369875d6f30260d8872469f8065dd6539085f5..ff5bd4a43b6e564eea7b93b356a545760d27581e 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -36,6 +36,7 @@
 #include "components/autofill/browser/personal_data_manager.h"
 #include "components/autofill/browser/personal_data_manager_observer.h"
 #include "components/autofill/browser/validation.h"
+#include "components/autofill/content/browser/autofill_driver_impl.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -229,7 +230,7 @@ class AutofillTest : public InProcessBrowserTest {
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     AutofillManager* autofill_manager =
-        AutofillManager::FromWebContents(web_contents);
+        AutofillDriverImpl::FromWebContents(web_contents)->autofill_manager();
     if (autofill_manager->IsNativeUiEnabled()) {
       external_delegate_.reset(
           new TestAutofillExternalDelegate(web_contents, autofill_manager));
@@ -243,7 +244,7 @@ class AutofillTest : public InProcessBrowserTest {
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     AutofillManager* autofill_manager =
-        AutofillManager::FromWebContents(web_contents);
+        AutofillDriverImpl::FromWebContents(web_contents)->autofill_manager();
     autofill_manager->delegate()->HideAutofillPopup();
   }