Abstract WebContentsObserver from Autofill shared code

chrome/browser/ui/autofill/autofill_popup_controller_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/browser/test_autofill_external_delegate.h"
 #include "components/autofill/browser/test_autofill_manager_delegate.h"
+#include "components/autofill/content/browser/autofill_driver_impl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::NiceMock;
 using base::WeakPtr;
@@ skipping 120 matching lines @@
 class AutofillPopupControllerUnitTest : public ChromeRenderViewHostTestHarness {
  public:
   AutofillPopupControllerUnitTest()
       : manager_delegate_(new MockAutofillManagerDelegate()),
         autofill_popup_controller_(NULL) {}
   virtual ~AutofillPopupControllerUnitTest() {}
 
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
 
-    AutofillManager::CreateForWebContentsAndDelegate(
+    AutofillDriverImpl::CreateForWebContentsAndDelegate(
         web_contents(),
         manager_delegate_.get(),
         "en-US",
-        AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER);
+        AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER,
+        false);
     external_delegate_.reset(
         new NiceMock<MockAutofillExternalDelegate>(
             web_contents(), AutofillManager::FromWebContents(web_contents())));
 
     autofill_popup_controller_ =
         new testing::NiceMock<TestAutofillPopupController>(
             external_delegate_->GetWeakPtr(), gfx::Rect());
   }
 
   virtual void TearDown() OVERRIDE {
@@ skipping 352 matching lines @@
     EXPECT_EQ(expected_popup_bounds[i].ToString(),
               autofill_popup_controller->popup_bounds().ToString()) <<
         "Popup bounds failed to match for test " << i;
 
     // Hide the controller to delete it.
     autofill_popup_controller->DoHide();
   }
 }
 
 }  // namespace autofill