Remove origin chip v1 and "hide on input" v2 behavior.

chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 00d7ba7109a9e9eac5853154de180bd7a8e48eb8..607d6fd3a27b8314759083d3bf24b51ca9588c1a 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6478,34 +6478,16 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION" desc="Description of about:flags option to enable Enhanced Bookmarks extension.">
         Provides an off switch for enhanced bookmarks experiment
       </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_NAME" desc="Name of about:flags option to enable the display of the Origin Chip experiment.">
+      <message name="IDS_FLAGS_ORIGIN_CHIP_NAME" desc="Name of about:flags option to enable the display of the origin chip experiment.">
         Enable origin chip
       </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_DESCRIPTION" desc="Description of about:flags option to enable the display of the Origin Chip experiment.">
-        Moves the URL out of the Omnibox and shows the hostname in the origin chip in the toolbar.
+      <message name="IDS_FLAGS_ORIGIN_CHIP_DESCRIPTION" desc="Description of about:flags option to enable the display of the origin chip experiment.">
+        Hides the URL in the Omnibox and instead shows the hostname in a clickable chip.
       </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_LEADING_LOCATION_BAR" desc="Option in a drop-down menu to enable the display of the origin chip leading the location bar.">
-        Enabled and positioned leading the location bar
+      <message name="IDS_FLAGS_ORIGIN_CHIP" desc="Option in a drop-down menu to enable the display of the origin chip.">
+        Enabled; shown on all pages
       </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_TRAILING_LOCATION_BAR" desc="Option in a drop-down menu to enable the display of the origin chip trailing the location bar.">
-        Enabled and positioned trailing the location bar
-      </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_LEADING_MENU_BUTTON" desc="Option in a drop-down menu to enable the display of the origin chip leading the app menu button.">
-        Enabled and positioned leading the app menu button
-      </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_V2_NAME" desc="Name of about:flags option to enable the display of the origin chip v2 experiment.">
-        Enable origin chip in Omnibox
-      </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_V2_DESCRIPTION" desc="Description of about:flags option to enable the display of the origin chip v2 experiment.">
-        Moves the URL out of the Omnibox and shows the hostname in the origin chip in the Omnibox.
-      </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE" desc="Option in a drop-down menu to enable the display of the origin chip v2, with the hides-on-mouse-release behavior.">
-        Enabled; hides on click in the Omnibox
-      </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT" desc="Option in a drop-down menu to enable the display of the origin chip v2, with the hides-on-input behavior.">
-        Enabled; hides on input in the Omnibox
-      </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_V2_ON_SRP" desc="Option in a drop-down menu to enable the display of the origin chip v2, with the shown-only-on-srp behavior.">
+      <message name="IDS_FLAGS_ORIGIN_CHIP_ON_SRP" desc="Option in a drop-down menu to enable the display of the origin chip, with the shown-only-on-srp behavior.">
         Enabled; shown only on search result pages
       </message>
       <message name="IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_NAME" desc="Name of about:flags option to enable the search button in omnibox experiment.">