Start removing deprecated Options UI code

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 640 matching lines @@
       profile->GetPrefs()->GetString(prefs::kNewTabPageLocationOverride);
   if (ntp_location.empty())
     return false;
 
   *url = GURL(ntp_location);
   return true;
 }
 
 // Handles rewriting Web UI URLs.
 bool HandleWebUI(GURL* url, content::BrowserContext* browser_context) {
-  if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
-    // Rewrite chrome://help and chrome://chrome to chrome://settings/help.
-    if (url->host() == chrome::kChromeUIHelpHost ||
-        (url->host() == chrome::kChromeUIUberHost &&
-         (url->path().empty() || url->path() == "/"))) {
-      *url = ReplaceURLHostAndPath(*url, chrome::kChromeUISettingsHost,
-                                   chrome::kChromeUIHelpHost);
-      return true;  // Return true to update the displayed URL.
-    }
+  // Rewrite chrome://help and chrome://chrome to chrome://settings/help.
+  if (url->host() == chrome::kChromeUIHelpHost ||
+      (url->host() == chrome::kChromeUIUberHost &&
+       (url->path().empty() || url->path() == "/"))) {
+    *url = ReplaceURLHostAndPath(*url, chrome::kChromeUISettingsHost,
+                                 chrome::kChromeUIHelpHost);
+    return true;  // Return true to update the displayed URL.
   }
 
   // Do not handle special URLs such as "about:foo"
   if (!url->host().empty()) {
     const GURL chrome_url = AddUberHost(*url);
 
     // Handle valid "chrome://chrome/foo" URLs so the reverse handler will
     // be called.
     if (ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL(
             browser_context, chrome_url))
@@ skipping 19 matching lines @@
 #endif
 
   return true;
 }
 
 // Reverse URL handler for Web UI. Maps "chrome://chrome/foo/" to
 // "chrome://foo/".
 bool HandleWebUIReverse(GURL* url, content::BrowserContext* browser_context) {
   // No need to actually reverse-rewrite the URL, but return true to update the
   // displayed URL when rewriting chrome://help to chrome://settings/help.
-  if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings) &&
-      url->host() == chrome::kChromeUISettingsHost) {
+  if (url->host() == chrome::kChromeUISettingsHost)
     return true;
-  }
 
   if (!url->is_valid() || !url->SchemeIs(content::kChromeUIScheme))
     return false;
 
   return RemoveUberHost(url);
 }
 
 bool CertMatchesFilter(const net::X509Certificate& cert,
                        const base::DictionaryValue& filter) {
   // TODO(markusheintz): This is the minimal required filter implementation.
@@ skipping 2885 matching lines @@
     RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
 }
 
 // static
 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
     const storage::QuotaSettings* settings) {
   g_default_quota_settings = settings;
 }