OLD | NEW |
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_utils.h" | 5 #include "chromeos/network/onc/onc_utils.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/json/json_file_value_serializer.h" | 9 #include "base/json/json_file_value_serializer.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/macros.h" |
11 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
12 #include "base/values.h" | 13 #include "base/values.h" |
13 #include "chromeos/chromeos_test_utils.h" | 14 #include "chromeos/chromeos_test_utils.h" |
14 #include "chromeos/network/network_ui_data.h" | 15 #include "chromeos/network/network_ui_data.h" |
15 #include "chromeos/network/onc/onc_signature.h" | 16 #include "chromeos/network/onc/onc_signature.h" |
16 #include "chromeos/network/onc/onc_test_utils.h" | 17 #include "chromeos/network/onc/onc_test_utils.h" |
17 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
18 | 19 |
19 namespace chromeos { | 20 namespace chromeos { |
20 | 21 |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 | 214 |
214 scoped_ptr<base::DictionaryValue> actual_proxy_settings = | 215 scoped_ptr<base::DictionaryValue> actual_proxy_settings = |
215 ConvertProxyConfigToOncProxySettings(*shill_proxy_config); | 216 ConvertProxyConfigToOncProxySettings(*shill_proxy_config); |
216 EXPECT_TRUE( | 217 EXPECT_TRUE( |
217 test_utils::Equals(onc_proxy_settings, actual_proxy_settings.get())); | 218 test_utils::Equals(onc_proxy_settings, actual_proxy_settings.get())); |
218 } | 219 } |
219 } | 220 } |
220 | 221 |
221 } // namespace onc | 222 } // namespace onc |
222 } // namespace chromeos | 223 } // namespace chromeos |
OLD | NEW |