Abstract WebContentsObserver from Autofill shared code

chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc

 // Copyright (c) 2013 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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/browser/test_autofill_external_delegate.h"
+#include "components/autofill/content/browser/autofill_driver_impl.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/test_utils.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
 
 namespace autofill {
 namespace {
 
 class TestAutofillExternalDelegate : public AutofillExternalDelegate {
@@ skipping 46 matching lines @@
   virtual ~AutofillPopupControllerBrowserTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     web_contents_ = browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(web_contents_ != NULL);
     Observe(web_contents_);
 
     autofill_external_delegate_.reset(
        new TestAutofillExternalDelegate(
            web_contents_,
-           AutofillManager::FromWebContents(web_contents_)));
+           AutofillDriverImpl::FromWebContents(
+               web_contents_)->autofill_manager()));
   }
 
   // Normally the WebContents will automatically delete the delegate, but here
   // the delegate is owned by this test, so we have to manually destroy.
   virtual void WebContentsDestroyed(content::WebContents* web_contents)
       OVERRIDE {
     DCHECK_EQ(web_contents_, web_contents);
 
     autofill_external_delegate_.reset();
   }
@@ skipping 28 matching lines @@
                        DeleteDelegateBeforePopupHidden){
   GenerateTestAutofillPopup(autofill_external_delegate_.get());
 
   // Delete the external delegate here so that is gets deleted before popup is
   // hidden. This can happen if the web_contents are destroyed before the popup
   // is hidden. See http://crbug.com/232475
   autofill_external_delegate_.reset();
 }
 
 }  // namespace autofill