[MD Settings] Add feature to enable md-settings by default.

chrome/browser/browser_about_handler.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/browser_about_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 70 matching lines @@
     } else {
 #if defined(OS_ANDROID)
       // On Android, redirect directly to chrome://history-frame since
       // uber page is unsupported.
       host = chrome::kChromeUIHistoryFrameHost;
 #else
       host = chrome::kChromeUIUberHost;
       path = chrome::kChromeUIHistoryHost + url->path();
 #endif
     }
-  // Redirect chrome://settings
+    // Redirect chrome://settings, unless MD settings is enabled.
   } else if (host == chrome::kChromeUISettingsHost) {
     if (::switches::AboutInSettingsEnabled()) {
       host = chrome::kChromeUISettingsFrameHost;
-    } else {
+    } else if (!base::FeatureList::IsEnabled(
+                   features::kMaterialDesignSettingsFeature)) {
       host = chrome::kChromeUIUberHost;
       path = chrome::kChromeUISettingsHost + url->path();
     }
-  // Redirect chrome://help
+    // Redirect chrome://help, unless MD settings is enabled.
   } else if (host == chrome::kChromeUIHelpHost) {
     if (::switches::AboutInSettingsEnabled()) {
       host = chrome::kChromeUISettingsFrameHost;
       if (url->path().empty() || url->path() == "/")
         path = chrome::kChromeUIHelpHost;
+    } else if (!base::FeatureList::IsEnabled(
+                   features::kMaterialDesignSettingsFeature)) {
     } else {

[Dan Beam, 2016/06/03 03:01:43]

this } else { seems wrong

[groby-ooo-7-16, 2016/06/06 20:11:59]

Sure does. Thanks for catching.

       host = chrome::kChromeUIUberHost;
       path = chrome::kChromeUIHelpHost + url->path();
     }
   }
 
   GURL::Replacements replacements;
   replacements.SetHostStr(host);
   if (!path.empty())
     replacements.SetPathStr(path);
   *url = url->ReplaceComponents(replacements);
@@ skipping 12 matching lines @@
         FROM_HERE, base::Bind(&chrome::AttemptRestart));
     return true;
   } else if (base::LowerCaseEqualsASCII(spec, chrome::kChromeUIQuitURL)) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&chrome::AttemptExit));
     return true;
   }
 
   return false;
 }