| Index: components/autofill/core/browser/autofill_manager.h | 
| diff --git a/components/autofill/core/browser/autofill_manager.h b/components/autofill/core/browser/autofill_manager.h | 
| index b9e4d3115229f56c37ce035654e7eb904ed74c31..81451afd372c4965b7090824d2f4e25aee31acc7 100644 | 
| --- a/components/autofill/core/browser/autofill_manager.h | 
| +++ b/components/autofill/core/browser/autofill_manager.h | 
| @@ -19,13 +19,11 @@ | 
| #include "base/memory/weak_ptr.h" | 
| #include "base/strings/string16.h" | 
| #include "base/time/time.h" | 
| -#include "components/autofill/content/browser/autocheckout_manager.h" | 
| #include "components/autofill/core/browser/autocomplete_history_manager.h" | 
| #include "components/autofill/core/browser/autofill_download.h" | 
| #include "components/autofill/core/browser/autofill_manager_delegate.h" | 
| #include "components/autofill/core/browser/form_structure.h" | 
| #include "components/autofill/core/browser/personal_data_manager.h" | 
| -#include "components/autofill/core/common/autocheckout_status.h" | 
| #include "components/autofill/core/common/form_data.h" | 
| #include "components/autofill/core/common/forms_seen_state.h" | 
| #include "third_party/WebKit/public/web/WebFormElement.h" | 
| @@ -167,23 +165,9 @@ class AutofillManager : public AutofillDownloadManager::Observer { | 
| void OnRequestAutocomplete(const FormData& form, | 
| const GURL& frame_url); | 
|  | 
| -  // Called to signal a page is completed in renderer in the Autocheckout flow. | 
| -  void OnAutocheckoutPageCompleted(autofill::AutocheckoutStatus status); | 
| - | 
| -  // Shows the Autocheckout bubble if conditions are right. See comments for | 
| -  // AutocheckoutManager::MaybeShowAutocheckoutBubble. Input element requesting | 
| -  // bubble belongs to |form|. |bounding_box| is the bounding box of the input | 
| -  // field in focus. | 
| -  virtual void OnMaybeShowAutocheckoutBubble(const FormData& form, | 
| -                                             const gfx::RectF& bounding_box); | 
| - | 
| // Resets cache. | 
| virtual void Reset(); | 
|  | 
| -  autofill::AutocheckoutManager* autocheckout_manager() { | 
| -    return &autocheckout_manager_; | 
| -  } | 
| - | 
| protected: | 
| // Test code should prefer to use this constructor. | 
| AutofillManager(AutofillDriver* driver, | 
| @@ -242,9 +226,6 @@ class AutofillManager : public AutofillDownloadManager::Observer { | 
| void ReturnAutocompleteData(const FormStructure* result, | 
| const std::string& unused_transaction_id); | 
|  | 
| -  // Returns the matched whitelist URL prefix for the current tab's url. | 
| -  virtual std::string GetAutocheckoutURLPrefix() const; | 
| - | 
| // Fills |host| with the RenderViewHost for this tab. | 
| // Returns false if Autofill is disabled or if the host is unavailable. | 
| bool GetHost(content::RenderViewHost** host) const WARN_UNUSED_RESULT; | 
| @@ -333,9 +314,6 @@ class AutofillManager : public AutofillDownloadManager::Observer { | 
| // Handles single-field autocomplete form data. | 
| scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_; | 
|  | 
| -  // Handles autocheckout flows. | 
| -  autofill::AutocheckoutManager autocheckout_manager_; | 
| - | 
| // For logging UMA metrics. Overridden by metrics tests. | 
| scoped_ptr<const AutofillMetrics> metric_logger_; | 
| // Have we logged whether Autofill is enabled for this page load? | 
|  |