| Index: components/autofill/core/browser/autofill_manager_delegate.h | 
| diff --git a/components/autofill/core/browser/autofill_manager_delegate.h b/components/autofill/core/browser/autofill_manager_delegate.h | 
| index 374c105fd5dce8fd96a5d973e1e59953fcba6259..91474e781459d858207084630bdeb2c55c8dfb2e 100644 | 
| --- a/components/autofill/core/browser/autofill_manager_delegate.h | 
| +++ b/components/autofill/core/browser/autofill_manager_delegate.h | 
| @@ -11,8 +11,6 @@ | 
| #include "base/i18n/rtl.h" | 
| #include "base/memory/weak_ptr.h" | 
| #include "base/strings/string16.h" | 
| -#include "components/autofill/content/browser/autocheckout_steps.h" | 
| -#include "components/autofill/core/browser/autocheckout_bubble_state.h" | 
|  | 
| namespace content { | 
| struct PasswordForm; | 
| @@ -37,10 +35,7 @@ class PasswordGenerator; | 
| class PersonalDataManager; | 
| struct FormData; | 
|  | 
| -namespace autocheckout { | 
| -class WhitelistManager; | 
| -} | 
| - | 
| +// TODO(ramankk): Simplify dialog type when removing autocheckout. | 
| enum DialogType { | 
| // Autofill dialog for the Autocheckout feature. | 
| DIALOG_TYPE_AUTOCHECKOUT, | 
| @@ -66,23 +61,9 @@ class AutofillManagerDelegate { | 
| // Gets the preferences associated with the delegate. | 
| virtual PrefService* GetPrefs() = 0; | 
|  | 
| -  // Gets the autocheckout::WhitelistManager instance associated with the | 
| -  // delegate. | 
| -  virtual autocheckout::WhitelistManager* | 
| -      GetAutocheckoutWhitelistManager() const = 0; | 
| - | 
| // Hides the associated request autocomplete dialog (if it exists). | 
| virtual void HideRequestAutocompleteDialog() = 0; | 
|  | 
| -  // Causes an error explaining that Autocheckout has failed to be displayed to | 
| -  // the user. | 
| -  virtual void OnAutocheckoutError() = 0; | 
| - | 
| -  // Called when an Autocheckout flow has succeeded. Causes a notification | 
| -  // explaining that they must confirm their purchase to be displayed to the | 
| -  // user. | 
| -  virtual void OnAutocheckoutSuccess() = 0; | 
| - | 
| // Causes the Autofill settings UI to be shown. | 
| virtual void ShowAutofillSettings() = 0; | 
|  | 
| @@ -93,16 +74,6 @@ class AutofillManagerDelegate { | 
| const CreditCard& credit_card, | 
| const base::Closure& save_card_callback) = 0; | 
|  | 
| -  // Causes the Autocheckout bubble UI to be displayed. |bounding_box| is the | 
| -  // anchor for the bubble. |is_google_user| is whether or not the user is | 
| -  // logged into or has been logged into accounts.google.com. |callback| is run | 
| -  // if the bubble is accepted. The returned boolean informs the caller whether | 
| -  // or not the bubble is successfully shown. | 
| -  virtual bool ShowAutocheckoutBubble( | 
| -      const gfx::RectF& bounding_box, | 
| -      bool is_google_user, | 
| -      const base::Callback<void(AutocheckoutBubbleState)>& callback) = 0; | 
| - | 
| // Causes the dialog for request autocomplete feature to be shown. | 
| virtual void ShowRequestAutocompleteDialog( | 
| const FormData& form, | 
| @@ -111,9 +82,6 @@ class AutofillManagerDelegate { | 
| const base::Callback<void(const FormStructure*, | 
| const std::string&)>& callback) = 0; | 
|  | 
| -  // Hide the Autocheckout bubble if one is currently showing. | 
| -  virtual void HideAutocheckoutBubble() = 0; | 
| - | 
| // Shows an Autofill popup with the given |values|, |labels|, |icons|, and | 
| // |identifiers| for the element at |element_bounds|. |delegate| will be | 
| // notified of popup events. | 
| @@ -136,12 +104,6 @@ class AutofillManagerDelegate { | 
|  | 
| // Whether the Autocomplete feature of Autofill should be enabled. | 
| virtual bool IsAutocompleteEnabled() = 0; | 
| - | 
| -  // Update progress of the Autocheckout flow as displayed to the user. | 
| -  virtual void AddAutocheckoutStep(AutocheckoutStepType step_type) = 0; | 
| -  virtual void UpdateAutocheckoutStep( | 
| -      AutocheckoutStepType step_type, | 
| -      AutocheckoutStepStatus step_status) = 0; | 
| }; | 
|  | 
| }  // namespace autofill | 
|  |