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 122 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);
+    AutofillDriverImpl* driver =
+        AutofillDriverImpl::FromWebContents(web_contents());
     external_delegate_.reset(
         new NiceMock<MockAutofillExternalDelegate>(
-            web_contents(), AutofillManager::FromWebContents(web_contents())));
+            web_contents(),
+            driver->autofill_manager()));
 
     autofill_popup_controller_ =
         new testing::NiceMock<TestAutofillPopupController>(
             external_delegate_->GetWeakPtr(), gfx::Rect());
   }
 
   virtual void TearDown() OVERRIDE {
     // This will make sure the controller and the view (if any) are both
     // cleaned up.
     if (autofill_popup_controller_)
@@ skipping 176 matching lines @@
   EXPECT_EQ(base_size, autofill_popup_controller_->RowWidthWithoutText(0));
   EXPECT_EQ(base_size + subtext_increase,
             autofill_popup_controller_->RowWidthWithoutText(1));
   EXPECT_EQ(base_size + icon_increase,
             autofill_popup_controller_->RowWidthWithoutText(2));
   EXPECT_EQ(base_size + subtext_increase + icon_increase,
             autofill_popup_controller_->RowWidthWithoutText(3));
 }
 
 TEST_F(AutofillPopupControllerUnitTest, GetOrCreate) {
+  AutofillDriverImpl* driver =
+      AutofillDriverImpl::FromWebContents(web_contents());
   MockAutofillExternalDelegate delegate(
-      web_contents(), AutofillManager::FromWebContents(web_contents()));
+      web_contents(), driver->autofill_manager());
 
   WeakPtr<AutofillPopupControllerImpl> controller =
       AutofillPopupControllerImpl::GetOrCreate(
           WeakPtr<AutofillPopupControllerImpl>(), delegate.GetWeakPtr(), NULL,
           gfx::Rect(), base::i18n::UNKNOWN_DIRECTION);
   EXPECT_TRUE(controller.get());
 
   controller->Hide();
 
   controller = AutofillPopupControllerImpl::GetOrCreate(
@@ skipping 135 matching lines @@
 
   // The popup would be partially off the bottom and the right side of
   // the screen.
   element_bounds.push_back(
       gfx::RectF(desired_width * 1.5, desired_height * 1.5, 0, 0));
   expected_popup_bounds.push_back(
       gfx::Rect((desired_width + 1) / 2, (desired_height + 1) / 2,
                 desired_width, desired_height));
 
   for (size_t i = 0; i < element_bounds.size(); ++i) {
+    AutofillDriverImpl* driver =
+        AutofillDriverImpl::FromWebContents(web_contents());
     NiceMock<MockAutofillExternalDelegate> external_delegate(
-        web_contents(), AutofillManager::FromWebContents(web_contents()));
+        web_contents(), driver->autofill_manager());
     TestAutofillPopupController* autofill_popup_controller =
         new TestAutofillPopupController(external_delegate.GetWeakPtr(),
                                         element_bounds[i]);
 
     autofill_popup_controller->set_display(display);
     autofill_popup_controller->Show(names, names, names, autofill_ids);
 
     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