| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/network_state.h" | 5 #include "chromeos/network/network_state.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include <stdint.h> |
| 8 |
| 8 #include "base/i18n/streaming_utf8_validator.h" | 9 #include "base/i18n/streaming_utf8_validator.h" |
| 10 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
| 11 #include "base/values.h" | 13 #include "base/values.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
| 13 #include "third_party/cros_system_api/dbus/service_constants.h" | 15 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 14 | 16 |
| 15 namespace chromeos { | 17 namespace chromeos { |
| 16 | 18 |
| 17 namespace { | 19 namespace { |
| 18 | 20 |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 provider->SetStringWithoutPathExpansion( | 229 provider->SetStringWithoutPathExpansion( |
| 228 shill::kHostProperty, "third-party-vpn-provider-extension-id"); | 230 shill::kHostProperty, "third-party-vpn-provider-extension-id"); |
| 229 EXPECT_TRUE(SetProperty(shill::kProviderProperty, provider.Pass())); | 231 EXPECT_TRUE(SetProperty(shill::kProviderProperty, provider.Pass())); |
| 230 SignalInitialPropertiesReceived(); | 232 SignalInitialPropertiesReceived(); |
| 231 EXPECT_EQ(network_state_.vpn_provider_type(), shill::kProviderThirdPartyVpn); | 233 EXPECT_EQ(network_state_.vpn_provider_type(), shill::kProviderThirdPartyVpn); |
| 232 EXPECT_EQ(network_state_.third_party_vpn_provider_extension_id(), | 234 EXPECT_EQ(network_state_.third_party_vpn_provider_extension_id(), |
| 233 "third-party-vpn-provider-extension-id"); | 235 "third-party-vpn-provider-extension-id"); |
| 234 } | 236 } |
| 235 | 237 |
| 236 } // namespace chromeos | 238 } // namespace chromeos |
| OLD | NEW |