Start removing deprecated Options UI code

chrome/browser/browser_about_handler.cc

Index: chrome/browser/browser_about_handler.cc
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 8fc14bc3aca4b009e2f52423289b5a081497c45e..5e9dd30e5d9531421ce54ea06d71b1e2cfb2cc08 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -90,28 +90,12 @@ bool WillHandleBrowserAboutURL(GURL* url,
   // Redirect chrome://history.
   } else if (host == chrome::kChromeUIHistoryHost) {
     path = url->path();
-  // Redirect chrome://settings, unless MD settings is enabled.
+    // Redirect chrome://settings.
   } else if (host == chrome::kChromeUISettingsHost) {
-    if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
-      return true;  // Prevent further rewriting - this is a valid URL.
-    } else if (::switches::SettingsWindowEnabled()) {
-      host = chrome::kChromeUISettingsFrameHost;
-    } else {
-      host = chrome::kChromeUIUberHost;
-      path = chrome::kChromeUISettingsHost + url->path();
-    }
-  // Redirect chrome://help, unless MD settings is enabled.
+    return true;  // Prevent further rewriting - this is a valid URL.
+    // Redirect chrome://help, unless MD settings is enabled.

[Lei Zhang, 2017/06/06 21:10:54]

Obsolete comment?

[Dan Beam, 2017/06/06 21:32:56]

Done.

   } else if (host == chrome::kChromeUIHelpHost) {
-    if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
-      return false;  // Handled in the HandleWebUI handler.
-    } else if (::switches::SettingsWindowEnabled()) {
-      host = chrome::kChromeUISettingsFrameHost;
-      if (url->path().empty() || url->path() == "/")
-        path = chrome::kChromeUIHelpHost;
-    } else {
-      host = chrome::kChromeUIUberHost;
-      path = chrome::kChromeUIHelpHost + url->path();
-    }
+    return false;  // Handled in the HandleWebUI handler.
   }
 
   GURL::Replacements replacements;