Extract AutofillDialogController interface and common utilities.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
index fcc664d2f78b510c0910244589b8fb90c2b51151..ab486bed57aa9e9185f158fc9ac9a64d7f540e1f 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -14,6 +14,7 @@
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "chrome/browser/ui/autofill/account_chooser_model.h"
+#include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
@@ -67,6 +68,7 @@ class WalletSigninHelper;
 // This class drives the dialog that appears when a site uses the imperative
 // autocomplete API to fill out a form.
 class AutofillDialogControllerImpl : public AutofillDialogViewDelegate,
+                                     public AutofillDialogController,
                                      public AutofillPopupDelegate,
                                      public content::NotificationObserver,
                                      public SuggestionsMenuModelDelegate,
@@ -77,7 +79,7 @@ class AutofillDialogControllerImpl : public AutofillDialogViewDelegate,
  public:
   virtual ~AutofillDialogControllerImpl();
 
-  static base::WeakPtr<AutofillDialogControllerImpl> Create(
+  static base::WeakPtr<AutofillDialogController> Create(
       content::WebContents* contents,
       const FormData& form_structure,
       const GURL& source_url,
@@ -87,25 +89,26 @@ class AutofillDialogControllerImpl : public AutofillDialogViewDelegate,
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
-  void Show();
-  void Hide();
+  virtual void Show() OVERRIDE;
+  virtual void Hide() OVERRIDE;
 
   // Called when the tab hosting this dialog is activated by a user gesture.

[aruslan, 2013/08/07 21:07:00]

Remove descriptions, condense the overrides.
Add "// AutofillDialogController implementation." and reorder functions to match
the order in AutofillDialogController if necessary.

[aruslan, 2013/08/07 21:21:23]

Done.

   // Used to trigger a refresh of the user's Wallet data.
-  void TabActivated();
+  virtual void TabActivated() OVERRIDE;
 
   // Adds a step in the flow to the Autocheckout UI.
-  void AddAutocheckoutStep(AutocheckoutStepType step_type);
+  virtual void AddAutocheckoutStep(AutocheckoutStepType step_type) OVERRIDE;
 
   // Updates the status of a step in the Autocheckout UI.
-  void UpdateAutocheckoutStep(AutocheckoutStepType step_type,
-                              AutocheckoutStepStatus step_status);
+  virtual void UpdateAutocheckoutStep(
+      AutocheckoutStepType step_type,
+      AutocheckoutStepStatus step_status) OVERRIDE;
 
   // Called when there is an error in an active Autocheckout flow.
-  void OnAutocheckoutError();
+  virtual void OnAutocheckoutError() OVERRIDE;
 
   // Called when an Autocheckout flow completes successfully.
-  void OnAutocheckoutSuccess();
+  virtual void OnAutocheckoutSuccess() OVERRIDE;
 
   // Returns |view_| as a testable version of itself (if |view_| exists and
   // actually implements |AutofillDialogView::GetTestableView()|).