ONC: Fix handling of invalid proxy scheme.

chromeos/network/onc/onc_utils.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 "chromeos/network/onc/onc_utils.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/base64.h"
@@ skipping 913 matching lines @@
 
   if (type == ::onc::proxy::kDirect) {
     proxy_dict.reset(ProxyConfigDictionary::CreateDirect());
   } else if (type == ::onc::proxy::kWPAD) {
     proxy_dict.reset(ProxyConfigDictionary::CreateAutoDetect());
   } else if (type == ::onc::proxy::kPAC) {
     std::string pac_url;
     onc_proxy_settings.GetStringWithoutPathExpansion(::onc::proxy::kPAC,
                                                      &pac_url);
     GURL url(pac_url);
-    DCHECK(url.is_valid()) << "Invalid URL in ProxySettings.PAC";
+    if (!url.is_valid()) {
+      // Assume the scheme is missing, use http.
+      url = GURL(std::string(url::kHttpScheme) + url::kStandardSchemeSeparator +

[emaxx, 2016/12/29 22:05:36]

This logic looks a bit crude to me.
Could we use here the standard utility for fixing the human-input URLs - 
url_formatter::FixupURL?

[stevenjb, 2016/12/29 22:44:18]

Ah, I was looking for something like that but didn't find it. Done.

+                 pac_url);
+      if (!url.is_valid()) {
+        LOG(WARNING) << "Invalid URL in ProxySettings.PAC: " << pac_url;
+        url = GURL();
+      }
+    }
     proxy_dict.reset(ProxyConfigDictionary::CreatePacScript(url.spec(), false));
   } else if (type == ::onc::proxy::kManual) {
     const base::DictionaryValue* manual_dict = nullptr;
     onc_proxy_settings.GetDictionaryWithoutPathExpansion(::onc::proxy::kManual,
                                                          &manual_dict);
     std::string manual_spec;
     AppendProxyServerForScheme(*manual_dict, ::onc::proxy::kFtp, &manual_spec);
     AppendProxyServerForScheme(*manual_dict, ::onc::proxy::kHttp, &manual_spec);
     AppendProxyServerForScheme(*manual_dict, ::onc::proxy::kSocks,
                                &manual_spec);
@@ skipping 373 matching lines @@
                          const PrefService* local_state_prefs,
                          const NetworkState& network) {
   ::onc::ONCSource ignored_onc_source;
   const base::DictionaryValue* policy = onc::GetPolicyForNetwork(
       profile_prefs, local_state_prefs, network, &ignored_onc_source);
   return policy != NULL;
 }
 
 }  // namespace onc
 }  // namespace chromeos