Revert "Options2: Pull the trigger."

chrome/common/url_constants.cc

Index: chrome/common/url_constants.cc
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index e3f13b2c928b23d6634e5121385632916513acc6..8b176e5648eecf318eba1746f20b45743852c185 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -64,9 +64,6 @@ const char kChromeUIPolicyURL[] = "chrome://policy/";
 const char kChromeUIPrintURL[] = "chrome://print/";
 const char kChromeUISessionsURL[] = "chrome://sessions/";
 const char kChromeUISettingsURL[] = "chrome://settings/";
-// settings-frame is the URL used to directly access the new settings page in
-// the UberPage, AKA options2.
-const char kChromeUISettingsFrameURL[] = "chrome://settings-frame/";
 const char kChromeUIShorthangURL[] = "chrome://shorthang/";
 const char kChromeUISSLClientCertificateSelectorURL[] = "chrome://select-cert/";
 const char kChromeUISyncPromoURL[] = "chrome://syncpromo/";
@@ -170,7 +167,6 @@ const char kChromeUIQuotaInternalsHost[] = "quota-internals";
 const char kChromeUIResourcesHost[] = "resources";
 const char kChromeUISessionsHost[] = "sessions";
 const char kChromeUISettingsHost[] = "settings";
-const char kChromeUISettingsFrameHost[] = "settings-frame";
 const char kChromeUIShorthangHost[] = "shorthang";
 const char kChromeUISSLClientCertificateSelectorHost[] = "select-cert";
 const char kChromeUIStatsHost[] = "stats";