Remove OriginChip code.

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 7cf1c2e0d9263052f99a4da2fbf204faa19b1502..4da5628dad6046bbf24af909982534437a02fcdf 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -341,13 +341,17 @@ const Experiment::Choice kSearchButtonInOmniboxChoices[] = {
     switches::kEnableSearchButtonInOmniboxAlways, ""}
 };
 
-// See comment above for kSearchButtonInOmniboxChoices. The same reasoning
-// applies here.
-const Experiment::Choice kOriginChipChoices[] = {
+const Experiment::Choice kTouchScrollingModeChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kDisableOriginChip, ""},
-  { IDS_FLAGS_ORIGIN_CHIP_ALWAYS, switches::kEnableOriginChipAlways, ""},
-  { IDS_FLAGS_ORIGIN_CHIP_ON_SRP, switches::kEnableOriginChipOnSrp, ""}
+  { IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL,
+    switches::kTouchScrollingMode,
+    switches::kTouchScrollingModeTouchcancel },
+  { IDS_FLAGS_TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE,
+    switches::kTouchScrollingMode,
+    switches::kTouchScrollingModeAsyncTouchmove },
+  { IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE,
+    switches::kTouchScrollingMode,
+    switches::kTouchScrollingModeSyncTouchmove },
 };
 
 const Experiment::Choice kExtensionContentVerificationChoices[] = {
@@ -1693,13 +1697,6 @@ const Experiment kExperiments[] = {
     MULTI_VALUE_TYPE(kNumRasterThreadsChoices)
   },
   {
-    "origin-chip-in-omnibox",
-    IDS_FLAGS_ORIGIN_CHIP_NAME,
-    IDS_FLAGS_ORIGIN_CHIP_DESCRIPTION,
-    kOsCrOS | kOsMac | kOsWin | kOsLinux,
-    MULTI_VALUE_TYPE(kOriginChipChoices)
-  },
-  {
     "search-button-in-omnibox",
     IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_NAME,
     IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_DESCRIPTION,