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

chrome/common/chrome_switches.h

Index: chrome/common/chrome_switches.h
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 006bf22237fd2822ef894e25cff0d01ecf959ff2..2b98c30f703a1a1fa5a411961fa9d28c6fbbb9ed 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -94,7 +94,6 @@ extern const char kDisableMinimizeOnSecondLauncherItemClick[];
 extern const char kDisableNTPOtherSessionsMenu[];
 extern const char kDisableOfflineAutoReload[];
 extern const char kDisableOriginChip[];
-extern const char kDisableOriginChipV2[];
 extern const char kDisablePasswordManagerReauthentication[];
 extern const char kDisablePeopleSearch[];
 extern const char kDisablePnacl[];
@@ -160,14 +159,8 @@ extern const char kEnableNpnHttpOnly[];
 extern const char kEnableOfflineAutoReload[];
 extern const char kEnableOfflineLoadStaleCache[];
 extern const char kDisableOfflineLoadStaleCache[];
-extern const char kEnableOriginChip[];
-extern const char kEnableOriginChipLeadingLocationBar[];
-extern const char kEnableOriginChipTrailingLocationBar[];
-extern const char kEnableOriginChipLeadingMenuButton[];
-extern const char kEnableOriginChipV2[];
-extern const char kEnableOriginChipV2HideOnMouseRelease[];
-extern const char kEnableOriginChipV2HideOnUserInput[];
-extern const char kEnableOriginChipV2OnSrp[];
+extern const char kEnableOriginChipAlways[];
+extern const char kEnableOriginChipOnSrp[];
 extern const char kEnablePanels[];
 extern const char kEnablePermissionsBubbles[];
 extern const char kEnableQueryExtraction[];