Abstract WebContentsObserver from Autofill shared code

chrome/browser/autofill/autofill_browsertest.cc

 // Copyright (c) 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 <string>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 18 matching lines @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/browser/autofill_common_test.h"
 #include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/browser/autofill_manager_test_delegate.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #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"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/test_utils.h"
 #include "net/url_request/test_url_fetcher_factory.h"
@@ skipping 173 matching lines @@
 
   virtual void SetUpOnMainThread() OVERRIDE {
     // Don't want Keychain coming up on Mac.
     test::DisableSystemServices(browser()->profile());
 
     // When testing the native UI, hook up a test external delegate, which
     // allows us to forward keyboard events to the popup directly.
     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));
       autofill_manager->SetExternalDelegate(external_delegate_.get());
     }
     autofill_manager->SetTestDelegate(&test_delegate_);
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     // Make sure to close any showing popups prior to tearing down the UI.
     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();
   }
 
   PersonalDataManager* personal_data_manager() {
     return PersonalDataManagerFactory::GetForProfile(browser()->profile());
   }
 
   void CreateTestProfile() {
     AutofillProfile profile;
     test::SetProfileInfo(
@@ skipping 1455 matching lines @@
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedDuplicatedProfiles) {
   int num_of_profiles =
       AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
 
   ASSERT_GT(num_of_profiles,
             static_cast<int>(personal_data_manager()->GetProfiles().size()));
 }
 
 }  // namespace autofill