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 7c7d8c42806fdb7fd92acde3d16bb794b7ac3b0b..db7bcc768ca55f35f7cbc73aa8bb98d968372803 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[];
@@ -161,13 +160,7 @@ 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 kEnableOriginChipOnSrp[];
 extern const char kEnablePanels[];
 extern const char kEnablePermissionsBubbles[];
 extern const char kEnableQueryExtraction[];