Eliminate AutofillExternalDelegate being a WebContentsUserData

components/autofill/content/browser/autofill_driver_impl.cc

 // Copyright 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 "components/autofill/content/browser/autofill_driver_impl.h"
 
 #include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/browser/autofill_manager_delegate.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 39 matching lines @@
 
 AutofillDriverImpl::AutofillDriverImpl(
     content::WebContents* web_contents,
     autofill::AutofillManagerDelegate* delegate,
     const std::string& app_locale,
     AutofillManager::AutofillDownloadManagerState enable_download_manager,
     bool enable_native_ui)
     : content::WebContentsObserver(web_contents),
       autofill_manager_(this, delegate, app_locale, enable_download_manager) {
   if (enable_native_ui) {
-    // TODO(blundell): Eliminate AutofillExternalDelegate being a WCUD and
-    // transfer ownership of it to this class.
-    AutofillExternalDelegate::CreateForWebContentsAndManager(
-        web_contents, &autofill_manager_);
-    autofill_manager_.SetExternalDelegate(
-        AutofillExternalDelegate::FromWebContents(web_contents));
+    SetAutofillExternalDelegate(scoped_ptr<AutofillExternalDelegate>(
+        new AutofillExternalDelegate(web_contents, &autofill_manager_)));
   }
 }
 
 AutofillDriverImpl::~AutofillDriverImpl() {}
 
 content::WebContents* AutofillDriverImpl::GetWebContents() {
   return web_contents();
 }
 
 bool AutofillDriverImpl::OnMessageReceived(const IPC::Message& message) {
   // TODO(blundell): Move IPC handling into this class.
   return autofill_manager_.OnMessageReceived(message);
 }
 
 void AutofillDriverImpl::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // TODO(blundell): Move the logic of this method into this class.
   autofill_manager_.DidNavigateMainFrame(details, params);
 }
 
+void AutofillDriverImpl::SetAutofillExternalDelegate(
+    scoped_ptr<AutofillExternalDelegate> delegate) {
+  autofill_external_delegate_.reset(delegate.release());
+  autofill_manager_.SetExternalDelegate(autofill_external_delegate_.get());
+}
+
 }  // namespace autofill