Remove some mentions of Autocheckout.

R=isherman@chromium.org,aruslan@chromium.org
BUG=none
TEST=`git grep -i autocheckout | wc -l` is less after this CL
NOTRY=true

Review URL: https://codereview.chromium.org/101513004

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

6 files changed, 4 insertions, 9 deletions

diff --git a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc
index fabac80a..9e73ef6 100644
--- a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc
+++ b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc
@@ -319,7 +319,7 @@ void AutofillDialogControllerAndroid::Show() {
 }
 
 void AutofillDialogControllerAndroid::Hide() {
-  // TODO(aruslan): http://crbug.com/177373 Autocheckout.
+  // TODO(aruslan): make the view actually hide. http://crbug.com/328205
   NOTIMPLEMENTED();
 }
 
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index d24a6ae..d2ea87c 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -3084,7 +3084,6 @@
             # Also not used on android
             'browser/ui/apps/chrome_shell_window_delegate.cc',
             'browser/ui/autofill/account_chooser_model.cc',
-            'browser/ui/autofill/autocheckout_bubble.cc',
             'browser/ui/autofill/autofill_dialog_sign_in_delegate.cc',
             'browser/ui/autofill/country_combobox_model.cc',
             'browser/ui/bookmarks/bookmark_drag_drop.cc',
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index e9f4774..3dbdf1f0 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -1099,7 +1099,7 @@ const char kAutofillGeneratedCardBubbleTimesShown[] =
     "autofill.generated_card_bubble_times_shown";
 
 // A dictionary that tracks the defaults to be set on the next invocation
-// of the requestAutocomplete/Autocheckout dialog.
+// of the requestAutocomplete dialog.
 const char kAutofillDialogDefaults[] = "autofill.rac_dialog_defaults";
 
 // Modifying bookmarks is completely disabled when this is set to false.
diff --git a/components/autofill/content/browser/DEPS b/components/autofill/content/browser/DEPS
index 5e8c358..c9bd39f 100644
--- a/components/autofill/content/browser/DEPS
+++ b/components/autofill/content/browser/DEPS
@@ -25,10 +25,6 @@ specific_include_rules = {
   # plain BrowserContext to a Profile. If on the other hand we move it
   # to the 'components_unittests' target, it will at this point fail
   # to build due to a few link-time dependencies.
-  'autocheckout_manager_unittest.cc': [
-    "!chrome/test/base/chrome_render_view_host_test_harness.h",
-    "!chrome/test/base/testing_profile.h",
-  ],
   'autofill_driver_impl_unittest.cc': [
     "!chrome/test/base/chrome_render_view_host_test_harness.h",
   ],
diff --git a/components/autofill/content/browser/risk/proto/fingerprint.proto b/components/autofill/content/browser/risk/proto/fingerprint.proto
index 5cacd76..4ea3b6a 100644
--- a/components/autofill/content/browser/risk/proto/fingerprint.proto
+++ b/components/autofill/content/browser/risk/proto/fingerprint.proto
@@ -64,7 +64,7 @@ message Fingerprint {
     // Browser features that integrate with Risk.
     enum BrowserFeature {
       FEATURE_UNKNOWN = 0;  // Should not be reachable.
-      FEATURE_AUTOCHECKOUT = 1;
+      DEPRECATED_FEATURE_AUTOCHECKOUT = 1;
       FEATURE_REQUEST_AUTOCOMPLETE = 2;
     }
 
diff --git a/components/autofill/core/browser/field_types.h b/components/autofill/core/browser/field_types.h
index 279e087..8da33d8 100644
--- a/components/autofill/core/browser/field_types.h
+++ b/components/autofill/core/browser/field_types.h
@@ -102,7 +102,7 @@ enum ServerFieldType {
 
   // Field types for options generally found in merchant buyflows. Given that
   // these are likely to be filled out differently on a case by case basis,
-  // they are here primarly for use by Autocheckout.
+  // they are here primarily for use by Autocheckout.
   MERCHANT_EMAIL_SIGNUP = 73,
   MERCHANT_PROMO_CODE = 74,