Re-land MD Settings fix for crash on back/forward navigation

chrome/browser/ui/webui/chrome_web_ui_controller_factory.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/ui/webui/chrome_web_ui_controller_factory.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 238 matching lines @@
   // so inject the correct DomDistillerService from chrome/.
   content::BrowserContext* browser_context =
       web_ui->GetWebContents()->GetBrowserContext();
   dom_distiller::DomDistillerService* service =
       dom_distiller::DomDistillerServiceFactory::GetForBrowserContext(
           browser_context);
   return new dom_distiller::DomDistillerUi(
       web_ui, service, dom_distiller::kDomDistillerScheme);
 }
 
+#if !defined(OS_ANDROID)
+template<>
+WebUIController* NewWebUI<settings::MdSettingsUI>(WebUI* web_ui,
+                                                  const GURL& url) {
+  return new settings::MdSettingsUI(web_ui, url);
+}
+#endif
+
 #if defined(ENABLE_EXTENSIONS)
 // Only create ExtensionWebUI for URLs that are allowed extension bindings,
 // hosted by actual tabs.
 bool NeedsExtensionWebUI(Profile* profile, const GURL& url) {
   if (!profile)
     return false;
 
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(profile)->enabled_extensions().
           GetExtensionOrAppByURL(url);
@@ skipping 538 matching lines @@
 #endif
 
   // Android doesn't use the plugins pages.
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes(scale_factor);
 
 #endif
 
   return NULL;
 }