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

Side by Side Diff: chromeos/network/onc/onc_translator_unittest.cc

Issue 1228543002: Translate ONC ProxySettings <-> Shill ProxyConfig (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/network/onc/onc_translator.h" 5 #include "chromeos/network/onc/onc_translator.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 ::testing::Values( 47 ::testing::Values(
48 std::make_pair("ethernet.onc", "shill_ethernet.json"), 48 std::make_pair("ethernet.onc", "shill_ethernet.json"),
49 std::make_pair("ethernet_with_eap_and_cert_pems.onc", 49 std::make_pair("ethernet_with_eap_and_cert_pems.onc",
50 "shill_ethernet_with_eap.json"), 50 "shill_ethernet_with_eap.json"),
51 std::make_pair("valid_wifi_psk.onc", "shill_wifi_psk.json"), 51 std::make_pair("valid_wifi_psk.onc", "shill_wifi_psk.json"),
52 std::make_pair("wifi_clientcert_with_cert_pems.onc", 52 std::make_pair("wifi_clientcert_with_cert_pems.onc",
53 "shill_wifi_clientcert.json"), 53 "shill_wifi_clientcert.json"),
54 std::make_pair("valid_wifi_clientref.onc", "shill_wifi_clientref.json"), 54 std::make_pair("valid_wifi_clientref.onc", "shill_wifi_clientref.json"),
55 std::make_pair("valid_l2tpipsec.onc", "shill_l2tpipsec.json"), 55 std::make_pair("valid_l2tpipsec.onc", "shill_l2tpipsec.json"),
56 std::make_pair("wifi_dhcp.onc", "shill_wifi_dhcp.json"), 56 std::make_pair("wifi_dhcp.onc", "shill_wifi_dhcp.json"),
57 std::make_pair("wifi_proxy.onc", "shill_wifi_proxy.json"),
57 std::make_pair("l2tpipsec_clientcert_with_cert_pems.onc", 58 std::make_pair("l2tpipsec_clientcert_with_cert_pems.onc",
58 "shill_l2tpipsec_clientcert.json"), 59 "shill_l2tpipsec_clientcert.json"),
59 std::make_pair("valid_openvpn_with_cert_pems.onc", 60 std::make_pair("valid_openvpn_with_cert_pems.onc",
60 "shill_openvpn.json"), 61 "shill_openvpn.json"),
61 std::make_pair("openvpn_clientcert_with_cert_pems.onc", 62 std::make_pair("openvpn_clientcert_with_cert_pems.onc",
62 "shill_openvpn_clientcert.json"), 63 "shill_openvpn_clientcert.json"),
63 std::make_pair("cellular.onc", "shill_cellular.json"), 64 std::make_pair("cellular.onc", "shill_cellular.json"),
64 std::make_pair("wimax.onc", "shill_wimax.json"), 65 std::make_pair("wimax.onc", "shill_wimax.json"),
65 std::make_pair("third_party_vpn.onc", "shill_third_party_vpn.json"))); 66 std::make_pair("third_party_vpn.onc", "shill_third_party_vpn.json")));
66 67
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 std::make_pair("shill_wifi_non_utf8_ssid.json", 106 std::make_pair("shill_wifi_non_utf8_ssid.json",
106 "translation_of_shill_wifi_non_utf8_ssid.onc"), 107 "translation_of_shill_wifi_non_utf8_ssid.onc"),
107 std::make_pair("shill_output_l2tpipsec.json", 108 std::make_pair("shill_output_l2tpipsec.json",
108 "translation_of_shill_l2tpipsec.onc"), 109 "translation_of_shill_l2tpipsec.onc"),
109 std::make_pair("shill_output_openvpn.json", 110 std::make_pair("shill_output_openvpn.json",
110 "translation_of_shill_openvpn.onc"), 111 "translation_of_shill_openvpn.onc"),
111 std::make_pair("shill_output_openvpn_with_errors.json", 112 std::make_pair("shill_output_openvpn_with_errors.json",
112 "translation_of_shill_openvpn_with_errors.onc"), 113 "translation_of_shill_openvpn_with_errors.onc"),
113 std::make_pair("shill_wifi_with_state.json", 114 std::make_pair("shill_wifi_with_state.json",
114 "translation_of_shill_wifi_with_state.onc"), 115 "translation_of_shill_wifi_with_state.onc"),
116 std::make_pair("shill_wifi_proxy.json",
117 "translation_of_shill_wifi_proxy.onc"),
115 std::make_pair("shill_cellular_with_state.json", 118 std::make_pair("shill_cellular_with_state.json",
116 "translation_of_shill_cellular_with_state.onc"), 119 "translation_of_shill_cellular_with_state.onc"),
117 std::make_pair("shill_wimax_with_state.json", 120 std::make_pair("shill_wimax_with_state.json",
118 "translation_of_shill_wimax_with_state.onc"), 121 "translation_of_shill_wimax_with_state.onc"),
119 std::make_pair("shill_output_third_party_vpn.json", 122 std::make_pair("shill_output_third_party_vpn.json",
120 "third_party_vpn.onc"))); 123 "third_party_vpn.onc")));
121 124
122 } // namespace onc 125 } // namespace onc
123 } // namespace chromeos 126 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698