chromeos/network/onc/onc_utils.cc - Issue 11962048: This adds Cellular to the Shill to ONC translation.

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: chromeos/network/onc/onc_utils.cc

Issue 11962048: This adds Cellular to the Shill to ONC translation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixing broken unit test Created 7 years, 11 months ago

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

Jump to:

Index: chromeos/network/onc/onc_utils.cc

diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc

index c66d1e843fb4993b7e39b538c6a3c35931f4372f..864ebc6b01961a44a27c88a343d51652b7a29d70 100644

--- a/chromeos/network/onc/onc_utils.cc

+++ b/chromeos/network/onc/onc_utils.cc

@@ -68,8 +68,8 @@ scoped_ptr<base::DictionaryValue> Decrypt(const std::string& passphrase,

!root.GetInteger(encrypted::kIterations, &iterations) ||

!root.GetString(encrypted::kSalt, &salt) ||

!root.GetString(encrypted::kStretch, &stretch_method) ||

- !root.GetString(kType, &onc_type) ||

- onc_type != kEncryptedConfiguration) {

+ !root.GetString(toplevel_config::kType, &onc_type) ||

+ onc_type != toplevel_config::kEncryptedConfiguration) {

ONC_LOG_ERROR("Encrypted ONC malformed.");

return scoped_ptr<base::DictionaryValue>();