Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/network/policy_util.cc

Issue 370623002: Remove most of NetworkUIData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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:
View side-by-side diff with in-line comments
Download patch
« chromeos/network/client_cert_util.cc ('K') | « chromeos/network/network_ui_data_unittest.cc ('k') | chromeos/test/data/network/policy/shill_policy_on_unmanaged_ethernet_eap.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/policy_util.cc
diff --git a/chromeos/network/policy_util.cc b/chromeos/network/policy_util.cc
index 0a7526ce10a1dda175ba62e39dfd13ee531e27e6..55fb320b5b7df6c77ab1c6a2d9185f0990f97f1c 100644
--- a/chromeos/network/policy_util.cc
+++ b/chromeos/network/policy_util.cc
@@ -178,11 +178,7 @@ scoped_ptr<base::DictionaryValue> CreateShillConfiguration(
shill_dictionary->SetStringWithoutPathExpansion(shill::kProfileProperty,
profile.path);
- scoped_ptr<NetworkUIData> ui_data;
- if (policy)
- ui_data = NetworkUIData::CreateFromONC(onc_source, *policy);
- else
- ui_data.reset(new NetworkUIData());
+ scoped_ptr<NetworkUIData> ui_data(NetworkUIData::CreateFromONC(onc_source));
if (settings) {
// Shill doesn't know that sensitive data is contained in the UIData
« chromeos/network/client_cert_util.cc ('K') | « chromeos/network/network_ui_data_unittest.cc ('k') | chromeos/test/data/network/policy/shill_policy_on_unmanaged_ethernet_eap.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698