chrome/browser/policy/network_configuration_updater.cc - Issue 11469026: Extending ONC validator's logging. Completing toplevel validation.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/policy/network_configuration_updater.cc

Issue 11469026: Extending ONC validator's logging. Completing toplevel validation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@add_error_handling_to_validator

Patch Set: Rebased. Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/policy/network_configuration_updater.h ('k') | chrome/browser/policy/network_configuration_updater_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/network_configuration_updater.cc

diff --git a/chrome/browser/policy/network_configuration_updater.cc b/chrome/browser/policy/network_configuration_updater.cc

index dbb5fafed956ad595c59b692252428b73143f20a..55c450295fbb6bc289bba6a0966505b9546c0f6d 100644

--- a/chrome/browser/policy/network_configuration_updater.cc

+++ b/chrome/browser/policy/network_configuration_updater.cc

@@ -11,13 +11,11 @@

#include "chrome/browser/chromeos/cros/network_library.h"

#include "chrome/browser/policy/policy_map.h"

#include "chromeos/network/onc/onc_constants.h"

+#include "chromeos/network/onc/onc_utils.h"

#include "policy/policy_constants.h"

namespace policy {

-const char NetworkConfigurationUpdater::kEmptyConfiguration[] =

- "{\"NetworkConfigurations\":[],\"Certificates\":[]}";

NetworkConfigurationUpdater::NetworkConfigurationUpdater(

PolicyService* policy_service,

chromeos::NetworkLibrary* network_library)

@@ -96,7 +94,7 @@ void NetworkConfigurationUpdater::ApplyNetworkConfiguration(

// An empty string is not a valid ONC and generates warnings and

// errors. Replace by a valid empty configuration.

if (new_network_config.empty())

- new_network_config = kEmptyConfiguration;

+ new_network_config = chromeos::onc::kEmptyUnencryptedConfiguration;

network_library_->LoadOncNetworks(new_network_config, "", onc_source,

allow_web_trust_);