[Autofill] Remove the "Disable native Autofill UI" flag.

BUG=51644
TEST=none
R=estade@chromium.org

Review URL: https://chromiumcodereview.appspot.com/17052008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207812 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 14 deletions

diff --git a/components/autofill/content/browser/autofill_driver_impl.cc b/components/autofill/content/browser/autofill_driver_impl.cc
index 937a803..d0bae53 100644
--- a/components/autofill/content/browser/autofill_driver_impl.cc
+++ b/components/autofill/content/browser/autofill_driver_impl.cc
@@ -27,8 +27,7 @@ void AutofillDriverImpl::CreateForWebContentsAndDelegate(
     content::WebContents* contents,
     autofill::AutofillManagerDelegate* delegate,
     const std::string& app_locale,
-    AutofillManager::AutofillDownloadManagerState enable_download_manager,
-    bool enable_native_ui) {
+    AutofillManager::AutofillDownloadManagerState enable_download_manager) {
   if (FromWebContents(contents))
     return;
 
@@ -36,8 +35,7 @@ void AutofillDriverImpl::CreateForWebContentsAndDelegate(
                         new AutofillDriverImpl(contents,
                                                delegate,
                                                app_locale,
-                                               enable_download_manager,
-                                               enable_native_ui));
+                                               enable_download_manager));
   // Trigger the lazy creation of AutocheckoutWhitelistManagerService, and
   // schedule a fetch of the Autocheckout whitelist file if it's not already
   // loaded. This helps ensure that the whitelist will be available by the time
@@ -56,14 +54,11 @@ AutofillDriverImpl::AutofillDriverImpl(
     content::WebContents* web_contents,
     autofill::AutofillManagerDelegate* delegate,
     const std::string& app_locale,
-    AutofillManager::AutofillDownloadManagerState enable_download_manager,
-    bool enable_native_ui)
+    AutofillManager::AutofillDownloadManagerState enable_download_manager)
     : content::WebContentsObserver(web_contents),
       autofill_manager_(this, delegate, app_locale, enable_download_manager) {
-  if (enable_native_ui) {
-    SetAutofillExternalDelegate(scoped_ptr<AutofillExternalDelegate>(
-        new AutofillExternalDelegate(web_contents, &autofill_manager_)));
-  }
+  SetAutofillExternalDelegate(scoped_ptr<AutofillExternalDelegate>(
+      new AutofillExternalDelegate(web_contents, &autofill_manager_)));
 }
 
 AutofillDriverImpl::~AutofillDriverImpl() {}
diff --git a/components/autofill/content/browser/autofill_driver_impl.h b/components/autofill/content/browser/autofill_driver_impl.h
index b577293..6181b80 100644
--- a/components/autofill/content/browser/autofill_driver_impl.h
+++ b/components/autofill/content/browser/autofill_driver_impl.h
@@ -38,8 +38,7 @@ class AutofillDriverImpl : public AutofillDriver,
       content::WebContents* contents,
       autofill::AutofillManagerDelegate* delegate,
       const std::string& app_locale,
-      AutofillManager::AutofillDownloadManagerState enable_download_manager,
-      bool enable_native_ui);
+      AutofillManager::AutofillDownloadManagerState enable_download_manager);
   static AutofillDriverImpl* FromWebContents(content::WebContents* contents);
 
   // AutofillDriver:
@@ -61,8 +60,7 @@ class AutofillDriverImpl : public AutofillDriver,
       content::WebContents* web_contents,
       autofill::AutofillManagerDelegate* delegate,
       const std::string& app_locale,
-      AutofillManager::AutofillDownloadManagerState enable_download_manager,
-      bool enable_native_ui);
+      AutofillManager::AutofillDownloadManagerState enable_download_manager);
   virtual ~AutofillDriverImpl();
 
   // content::WebContentsObserver: