diff options
| author | benchan@chromium.org <benchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 07:24:56 +0000 |
|---|---|---|
| committer | benchan@chromium.org <benchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 07:24:56 +0000 |
| commit | 547396c5c0ca818ca4ee7a4eb9667669a0898e73 (patch) | |
| tree | cf5f5d591e4f2482f44532451f1fdfde50601f67 /chromeos/network/network_cert_migrator_unittest.cc | |
| parent | 8b44fa5704850a6e891fd25aaaac34b616729df2 (diff) | |
| download | chromium_src-547396c5c0ca818ca4ee7a4eb9667669a0898e73.zip chromium_src-547396c5c0ca818ca4ee7a4eb9667669a0898e73.tar.gz chromium_src-547396c5c0ca818ca4ee7a4eb9667669a0898e73.tar.bz2 | |
Migrate DBus service constants from flimflam namespace to shill namespace.
All shill DBus service constants have been moved from the flimflam namespace to
the shill namespace. This CL makes the corresponding changes on the Chrome
side.
Related CLs:
https://chromium-review.googlesource.com/#/c/170123/
https://chromium-review.googlesource.com/#/c/170205/
https://chromium-review.googlesource.com/#/c/170206/
https://chromium-review.googlesource.com/#/c/170207/
https://chromium-review.googlesource.com/#/c/170208/
https://chromium-review.googlesource.com/#/c/170209/
https://chromium-review.googlesource.com/#/c/170223/
https://chromium-review.googlesource.com/#/c/170230/
https://chromium-review.googlesource.com/#/c/170231/
BUG=295425
R=gspencer@chromium.org,gauravsh@chromium.org,stevenjb@chromium.org
Review URL: https://chromiumcodereview.appspot.com/24348002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224942 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/network_cert_migrator_unittest.cc')
| -rw-r--r-- | chromeos/network/network_cert_migrator_unittest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chromeos/network/network_cert_migrator_unittest.cc b/chromeos/network/network_cert_migrator_unittest.cc index ee2dcdf..f1f5fb2 100644 --- a/chromeos/network/network_cert_migrator_unittest.cc +++ b/chromeos/network/network_cert_migrator_unittest.cc @@ -104,12 +104,12 @@ class NetworkCertMigratorTest : public testing::Test { const bool add_to_watchlist = true; service_test_->AddService(kWifiStub, kWifiStub, - flimflam::kTypeWifi, - flimflam::kStateOnline, + shill::kTypeWifi, + shill::kStateOnline, add_to_visible, add_to_watchlist); service_test_->SetServiceProperty(kWifiStub, - flimflam::kEapCaCertNssProperty, + shill::kEapCaCertNssProperty, base::StringValue(kNSSNickname)); } @@ -118,7 +118,7 @@ class NetworkCertMigratorTest : public testing::Test { ca_pem->clear(); const base::DictionaryValue* properties = service_test_->GetServiceProperties(kWifiStub); - properties->GetStringWithoutPathExpansion(flimflam::kEapCaCertNssProperty, + properties->GetStringWithoutPathExpansion(shill::kEapCaCertNssProperty, nss_nickname); const base::ListValue* ca_pems = NULL; properties->GetListWithoutPathExpansion(shill::kEapCaCertPemProperty, @@ -132,16 +132,16 @@ class NetworkCertMigratorTest : public testing::Test { const bool add_to_watchlist = true; service_test_->AddService(kVPNStub, kVPNStub, - flimflam::kTypeVPN, - flimflam::kStateIdle, + shill::kTypeVPN, + shill::kStateIdle, add_to_visible, add_to_watchlist); base::DictionaryValue provider; - const char* nss_property = open_vpn ? flimflam::kOpenVPNCaCertNSSProperty - : flimflam::kL2tpIpsecCaCertNssProperty; + const char* nss_property = open_vpn ? shill::kOpenVPNCaCertNSSProperty + : shill::kL2tpIpsecCaCertNssProperty; provider.SetStringWithoutPathExpansion(nss_property, kNSSNickname); service_test_->SetServiceProperty( - kVPNStub, flimflam::kProviderProperty, provider); + kVPNStub, shill::kProviderProperty, provider); } void GetVpnCACertProperties(bool open_vpn, @@ -152,12 +152,12 @@ class NetworkCertMigratorTest : public testing::Test { const base::DictionaryValue* properties = service_test_->GetServiceProperties(kVPNStub); const base::DictionaryValue* provider = NULL; - properties->GetDictionaryWithoutPathExpansion(flimflam::kProviderProperty, + properties->GetDictionaryWithoutPathExpansion(shill::kProviderProperty, &provider); if (!provider) return; - const char* nss_property = open_vpn ? flimflam::kOpenVPNCaCertNSSProperty - : flimflam::kL2tpIpsecCaCertNssProperty; + const char* nss_property = open_vpn ? shill::kOpenVPNCaCertNSSProperty + : shill::kL2tpIpsecCaCertNssProperty; provider->GetStringWithoutPathExpansion(nss_property, nss_nickname); const base::ListValue* ca_pems = NULL; const char* pem_property = open_vpn ? shill::kOpenVPNCaCertPemProperty |