Abstract WebContentsObserver from Autofill shared code

chrome/browser/ui/browser_tab_contents.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 "chrome/browser/ui/browser_tab_contents.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
@@ skipping 25 matching lines @@
 #include "chrome/browser/ui/hung_plugin_tab_helper.h"
 #include "chrome/browser/ui/pdf/pdf_tab_helper.h"
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/browser/ui/sad_tab_helper.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_manager.h"
+#include "components/autofill/content/browser/autofill_driver.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/view_type_utils.h"
 
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 #endif
 
 #if defined(ENABLE_MANAGED_USERS)
 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #endif
 
 #if defined(ENABLE_PRINTING)
 #include "chrome/browser/printing/print_preview_message_handler.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #endif
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/metro_pin_tab_helper_win.h"
 #endif
 
-using autofill::AutofillExternalDelegate;
+using autofill::AutofillDriver;
 using autofill::AutofillManager;
 using autofill::TabAutofillManagerDelegate;
 using content::WebContents;
 using web_modal::WebContentsModalDialogManager;
 
 namespace {
 
 const char kTabContentsAttachedTabHelpersUserDataKey[] =
     "TabContentsAttachedTabHelpers";
 
@@ skipping 18 matching lines @@
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
 
   // SessionTabHelper comes first because it sets up the tab ID, and other
   // helpers may rely on that.
   SessionTabHelper::CreateForWebContents(web_contents);
 
   AlternateErrorPageTabObserver::CreateForWebContents(web_contents);
   TabAutofillManagerDelegate::CreateForWebContents(web_contents);
-  AutofillManager::CreateForWebContentsAndDelegate(
+  bool native_autofill_ui_enabled =
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+           switches::kDisableNativeAutofillUi);
+  AutofillDriver::CreateForWebContentsAndDelegate(
       web_contents,
       TabAutofillManagerDelegate::FromWebContents(web_contents),
       g_browser_process->GetApplicationLocale(),
-      AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER);
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableNativeAutofillUi)) {
-    AutofillExternalDelegate::CreateForWebContentsAndManager(
-        web_contents, AutofillManager::FromWebContents(web_contents));
-    AutofillManager::FromWebContents(web_contents)->SetExternalDelegate(
-        AutofillExternalDelegate::FromWebContents(web_contents));
-  }
+      AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER,
+      native_autofill_ui_enabled);

[Ilya Sherman, 2013/06/05 10:50:02]

Rather than passing in the boolean, could you just query the commandline state
within the AutofillDriver?

[blundell, 2013/06/11 15:35:47]

Done.

[blundell, 2013/06/11 15:35:47]

Done.

   BlockedContentTabHelper::CreateForWebContents(web_contents);
   BookmarkTabHelper::CreateForWebContents(web_contents);
   chrome_browser_net::LoadTimeStatsTabHelper::CreateForWebContents(
       web_contents);
   chrome_browser_net::NetErrorTabHelper::CreateForWebContents(web_contents);
   WebContentsModalDialogManager::CreateForWebContents(web_contents);
   CoreTabHelper::CreateForWebContents(web_contents);
   extensions::TabHelper::CreateForWebContents(web_contents);
   extensions::WebNavigationTabObserver::CreateForWebContents(web_contents);
   ExternalProtocolObserver::CreateForWebContents(web_contents);
@@ skipping 49 matching lines @@
                                      std::string(),
                                      NULL)) {
     OneClickSigninHelper::CreateForWebContents(web_contents);
   }
 #endif
 
 #if defined(OS_WIN)
   MetroPinTabHelper::CreateForWebContents(web_contents);
 #endif
 }