chrome/browser/chromeos/cros/network_library_impl_stub.cc - Issue 11299236: This moves the ONC parsing code into chromeos/network/onc

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/chromeos/cros/network_library_impl_stub.cc

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix unit tests 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/chromeos/cros/network_library_impl_base.cc ('k') | chrome/browser/chromeos/cros/network_library_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/cros/network_library_impl_stub.cc

diff --git a/chrome/browser/chromeos/cros/network_library_impl_stub.cc b/chrome/browser/chromeos/cros/network_library_impl_stub.cc

index 26a3af6594f2c6c1473e1ce17b74dc465922741b..8f2b8fc56085a74734555d9011fde6042a6ef281 100644

--- a/chrome/browser/chromeos/cros/network_library_impl_stub.cc

+++ b/chrome/browser/chromeos/cros/network_library_impl_stub.cc

@@ -179,7 +179,7 @@ void NetworkLibraryImplStub::Init() {

wifi7->SetEAPIdentity("enterprise@example.com");

wifi7->SetEAPPassphrase("password");

NetworkUIData wifi7_ui_data;

- wifi7_ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_DEVICE_POLICY);

+ wifi7_ui_data.set_onc_source(onc::ONC_SOURCE_DEVICE_POLICY);

wifi7->set_ui_data(wifi7_ui_data);

AddStubNetwork(wifi7, PROFILE_USER);

@@ -211,7 +211,7 @@ void NetworkLibraryImplStub::Init() {

cellular3->set_activation_state(ACTIVATION_STATE_ACTIVATED);

cellular3->set_network_technology(NETWORK_TECHNOLOGY_EVDO);

NetworkUIData cellular3_ui_data;

- cellular3_ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_USER_POLICY);

+ cellular3_ui_data.set_onc_source(onc::ONC_SOURCE_USER_POLICY);

cellular3->set_ui_data(cellular3_ui_data);

AddStubNetwork(cellular3, PROFILE_NONE);

@@ -221,7 +221,7 @@ void NetworkLibraryImplStub::Init() {

cellular4->set_activation_state(ACTIVATION_STATE_ACTIVATED);

cellular4->set_network_technology(NETWORK_TECHNOLOGY_GSM);

NetworkUIData cellular4_ui_data;

- cellular4_ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_USER_POLICY);

+ cellular4_ui_data.set_onc_source(onc::ONC_SOURCE_USER_POLICY);

cellular4->set_ui_data(cellular4_ui_data);

AddStubNetwork(cellular4, PROFILE_NONE);

@@ -265,7 +265,7 @@ void NetworkLibraryImplStub::Init() {

vpn4->set_server_hostname("vpn4server.fake.com");

vpn4->set_provider_type(PROVIDER_TYPE_OPEN_VPN);

NetworkUIData vpn4_ui_data;

- vpn4_ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_DEVICE_POLICY);

+ vpn4_ui_data.set_onc_source(onc::ONC_SOURCE_DEVICE_POLICY);

vpn4->set_ui_data(vpn4_ui_data);

AddStubNetwork(vpn4, PROFILE_USER);

@@ -301,7 +301,7 @@ void NetworkLibraryImplStub::Init() {

" ],"

" \"Certificates\": []"

"}");

-// LoadOncNetworks(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT, NULL);

+// LoadOncNetworks(test_blob, "", onc::ONC_SOURCE_USER_IMPORT, NULL);

}

bool NetworkLibraryImplStub::IsCros() const {