Eliminate AutofillExternalDelegate being a WebContentsUserData

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 211 matching lines @@
   AutofillTest() {}
 
   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 =
-        AutofillDriverImpl::FromWebContents(web_contents)->autofill_manager();
+    AutofillDriverImpl* autofill_driver =
+        AutofillDriverImpl::FromWebContents(web_contents);
+    AutofillManager* autofill_manager = autofill_driver->autofill_manager();
     if (autofill_manager->IsNativeUiEnabled()) {
-      external_delegate_.reset(
+      scoped_ptr<AutofillExternalDelegate> external_delegate(
           new TestAutofillExternalDelegate(web_contents, autofill_manager));
-      autofill_manager->SetExternalDelegate(external_delegate_.get());
+      autofill_driver->SetAutofillExternalDelegate(external_delegate.Pass());
     }
     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 =
         AutofillDriverImpl::FromWebContents(web_contents)->autofill_manager();
@@ skipping 217 matching lines @@
     test_delegate_.Reset();
     content::SimulateKeyPress(
         browser()->tab_strip_model()->GetActiveWebContents(),
         key, false, false, false, false);
     test_delegate_.Wait();
   }
 
   void SendKeyToPopupAndWait(ui::KeyboardCode key) {
     // TODO(isherman): Remove this condition once the WebKit popup UI code is
     // removed.
-    if (!external_delegate_) {
+    if (!external_delegate()) {
       // When testing the WebKit-based UI, route all keys to the page.
       SendKeyToPageAndWait(key);
       return;
     }
 
     // When testing the native UI, route popup-targeted key presses via the
     // external delegate.
     content::NativeWebKeyboardEvent event;
     event.windowsKeyCode = key;
     test_delegate_.Reset();
-    external_delegate_->keyboard_listener()->HandleKeyPressEvent(event);
+    external_delegate()->keyboard_listener()->HandleKeyPressEvent(event);
     test_delegate_.Wait();
   }
 
   void TryBasicFormFill() {
     FocusFirstNameField();
 
     // Start filling the first name field with "M" and wait for the popup to be
     // shown.
     LOG(WARNING) << "Typing 'M' to bring up the Autofill popup.";
     SendKeyToPageAndWait(ui::VKEY_M);
@@ skipping 18 matching lines @@
 
     // Press Enter to accept the autofill suggestions.
     LOG(WARNING) << "Simulating Return press to fill the form.";
     SendKeyToPopupAndWait(ui::VKEY_RETURN);
 
     // The form should be filled.
     ExpectFilledTestForm();
   }
 
   TestAutofillExternalDelegate* external_delegate() {
-    return external_delegate_.get();
+    content::WebContents* web_contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
+    AutofillDriverImpl* autofill_driver =
+        AutofillDriverImpl::FromWebContents(web_contents);
+    return static_cast<TestAutofillExternalDelegate*>(
+        autofill_driver->autofill_external_delegate());
   }
 
   AutofillManagerTestDelegateImpl test_delegate_;
 
  private:
   net::TestURLFetcherFactory url_fetcher_factory_;
-  scoped_ptr<TestAutofillExternalDelegate> external_delegate_;
 };
 
 // http://crbug.com/150084
 #if defined(OS_MACOSX)
 #define MAYBE_BasicFormFill BasicFormFill
 #else
 #define MAYBE_BasicFormFill DISABLED_BasicFormFill
 #endif
 // Test that basic form fill is working.
 IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_BasicFormFill) {
@@ skipping 1170 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