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

Unified Diff: chrome/browser/automation/testing_automation_provider_chromeos.cc

Issue 7453051: This factors out all of the parsing code from the network library (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reducing friends to minimal set. Created 9 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/native_network_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider_chromeos.cc
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index 28f7076e1acc30be8dec0f7156b6b165ce2a74c1..ccf3e0d02251f23f12573ff0f867a6247ea109d1 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -149,13 +149,13 @@ void UpdateCheckCallback(void* user_data, chromeos::UpdateResult result,
}
const std::string VPNProviderTypeToString(
- chromeos::VirtualNetwork::ProviderType provider_type) {
+ chromeos::ProviderType provider_type) {
switch (provider_type) {
- case chromeos::VirtualNetwork::PROVIDER_TYPE_L2TP_IPSEC_PSK:
+ case chromeos::PROVIDER_TYPE_L2TP_IPSEC_PSK:
return std::string("L2TP_IPSEC_PSK");
- case chromeos::VirtualNetwork::PROVIDER_TYPE_L2TP_IPSEC_USER_CERT:
+ case chromeos::PROVIDER_TYPE_L2TP_IPSEC_USER_CERT:
return std::string("L2TP_IPSEC_USER_CERT");
- case chromeos::VirtualNetwork::PROVIDER_TYPE_OPEN_VPN:
+ case chromeos::PROVIDER_TYPE_OPEN_VPN:
return std::string("OPEN_VPN");
default:
return std::string("UNSUPPORTED_PROVIDER_TYPE");
@@ -713,7 +713,7 @@ void TestingAutomationProvider::AddPrivateNetwork(
// Attempt to connect to the VPN based on the provider type.
if (provider_type == VPNProviderTypeToString(
- chromeos::VirtualNetwork::PROVIDER_TYPE_L2TP_IPSEC_PSK)) {
+ chromeos::PROVIDER_TYPE_L2TP_IPSEC_PSK)) {
if (!args->GetString("key", &key)) {
AutomationJSONReply(this, reply_message)
.SendError("Missing key arg.");
@@ -727,7 +727,7 @@ void TestingAutomationProvider::AddPrivateNetwork(
username,
password);
} else if (provider_type == VPNProviderTypeToString(
- chromeos::VirtualNetwork::PROVIDER_TYPE_L2TP_IPSEC_USER_CERT)) {
+ chromeos::PROVIDER_TYPE_L2TP_IPSEC_USER_CERT)) {
if (!args->GetString("cert_id", &cert_id) ||
!args->GetString("cert_nss", &cert_nss)) {
AutomationJSONReply(this, reply_message)
@@ -743,7 +743,7 @@ void TestingAutomationProvider::AddPrivateNetwork(
username,
password);
} else if (provider_type == VPNProviderTypeToString(
- chromeos::VirtualNetwork::PROVIDER_TYPE_OPEN_VPN)) {
+ chromeos::PROVIDER_TYPE_OPEN_VPN)) {
// Connect using OPEN_VPN. Not yet supported by the VPN implementation.
AutomationJSONReply(this, reply_message)
.SendError("Provider type OPEN_VPN is not yet supported.");
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/native_network_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698