MD Settings: change how valid origins are checked and tested

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 65 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 {
 
+bool IsValidOrigin(const GURL& url) {
+  const GURL origin = url.GetOrigin();
+  return origin == GURL(chrome::kChromeUISettingsURL).GetOrigin() ||
+         origin == GURL(chrome::kChromeUIMdSettingsURL).GetOrigin();
+}
+
 // static
 void MdSettingsUI::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kImportDialogAutofillFormData, true);
   registry->RegisterBooleanPref(prefs::kImportDialogBookmarks, true);
   registry->RegisterBooleanPref(prefs::kImportDialogHistory, true);
   registry->RegisterBooleanPref(prefs::kImportDialogSavedPasswords, true);
   registry->RegisterBooleanPref(prefs::kImportDialogSearchEngine, true);
 }
 
@@ skipping 58 matching lines @@
   AddSettingsPageUIHandler(
       base::MakeUnique<chromeos::settings::InternetHandler>());
 #else
   AddSettingsPageUIHandler(base::MakeUnique<DefaultBrowserHandler>(web_ui));
   AddSettingsPageUIHandler(base::MakeUnique<ManageProfileHandler>(profile));
   AddSettingsPageUIHandler(base::MakeUnique<SystemHandler>());
 #endif
 
   // Host must be derived from the visible URL, since this might be serving
   // either chrome://settings or chrome://md-settings.
-  CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() ||
-        url.GetOrigin() == GURL(chrome::kChromeUIMdSettingsURL).GetOrigin());
+  CHECK(IsValidOrigin(url));
 
   content::WebUIDataSource* html_source =
       content::WebUIDataSource::Create(url.host());
   html_source->AddString("hostname", url.host());
 
 #if defined(OS_CHROMEOS)
   chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler =
       chromeos::settings::EasyUnlockSettingsHandler::Create(html_source,
                                                             profile);
   if (easy_unlock_handler)
@@ skipping 80 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