MD Settings: ... and we fixed all CHECK()-based URL crashes once and for all.

chrome/browser/ui/webui/settings/md_settings_ui.cc

 // Copyright 2015 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/settings/md_settings_ui.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 35 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(USE_NSS_CERTS)
 #include "chrome/browser/ui/webui/settings/certificates_handler.h"
 #elif defined(OS_WIN) || defined(OS_MACOSX)
 #include "chrome/browser/ui/webui/settings/native_certificates_handler.h"
 #endif  // defined(USE_NSS_CERTS)
 
 namespace settings {
 
-MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)
+MdSettingsUI::MdSettingsUI(content::WebUI* web_ui, const GURL& url)
     : content::WebUIController(web_ui),
       WebContentsObserver(web_ui->GetWebContents()) {
   Profile* profile = Profile::FromWebUI(web_ui);
   AddSettingsPageUIHandler(new AppearanceHandler(web_ui));
 
 #if defined(USE_NSS_CERTS)
   AddSettingsPageUIHandler(new CertificatesHandler(false));
 #elif defined(OS_WIN) || defined(OS_MACOSX)
   AddSettingsPageUIHandler(new NativeCertificatesHandler());
 #endif  // defined(USE_NSS_CERTS)
@@ skipping 14 matching lines @@
   AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());
   AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui));
 #else
   AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui));
   AddSettingsPageUIHandler(new ManageProfileHandler(profile));
   AddSettingsPageUIHandler(new SystemHandler());
 #endif
 
   // Host must be derived from the visible URL, since this might be serving
   // either chrome://settings or chrome://md-settings.
-  GURL url = web_ui->GetWebContents()->GetVisibleURL();
-
-  if (url.SchemeIs(content::kViewSourceScheme))
-    url = GURL(url.GetContent());
-
   CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() ||

[michaelpg, 2016/06/17 20:57:11]

it would be nice if we could just crash the tab instead of the entire browser.
Is that possible somehow?

[Dan Beam, 2016/06/17 21:05:15]

CHECK() is stuff that should never happen, so I don't think it's worth handling
it in a "better" way

         url.GetOrigin() == GURL(chrome::kChromeUIMdSettingsURL).GetOrigin());
 
   content::WebUIDataSource* html_source =
       content::WebUIDataSource::Create(url.host());
 
 #if defined(OS_CHROMEOS)
   chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler =
       chromeos::settings::EasyUnlockSettingsHandler::Create(html_source,
                                                             profile);
   if (easy_unlock_handler)
@@ skipping 38 matching lines @@
   UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
                       base::Time::Now() - load_start_time_);
 }
 
 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
   UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
                       base::Time::Now() - load_start_time_);
 }
 
 }  // namespace settings