| 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 "chrome/browser/chromeos/network_settings/onc_translator.h" | 5 #include "chromeos/network/onc_translator.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chrome/browser/chromeos/cros/onc_constants.h" | 9 #include "chromeos/network/onc_constants.h" |
| 10 #include "chrome/browser/chromeos/network_settings/onc_signature.h" | 10 #include "chromeos/network/onc_signature.h" |
| 11 #include "chrome/browser/chromeos/network_settings/onc_test_utils.h" | 11 #include "chromeos/network/onc_test_utils.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 13 | 13 |
| 14 namespace chromeos { | 14 namespace chromeos { |
| 15 namespace onc { | 15 namespace onc { |
| 16 | 16 |
| 17 // First parameter: Filename of source ONC. | 17 // First parameter: Filename of source ONC. |
| 18 // Second parameter: Filename of expected translated Shill json. | 18 // Second parameter: Filename of expected translated Shill json. |
| 19 class ONCTranslatorOncToShillTest | 19 class ONCTranslatorOncToShillTest |
| 20 : public ::testing::TestWithParam<std::pair<std::string, std::string> > { | 20 : public ::testing::TestWithParam<std::pair<std::string, std::string> > { |
| 21 }; | 21 }; |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 test_utils::ReadTestDictionary("shill_openvpn.json")); | 77 test_utils::ReadTestDictionary("shill_openvpn.json")); |
| 78 | 78 |
| 79 scoped_ptr<base::DictionaryValue> translation(TranslateShillServiceToONCPart( | 79 scoped_ptr<base::DictionaryValue> translation(TranslateShillServiceToONCPart( |
| 80 *shill_network, &kNetworkConfigurationSignature)); | 80 *shill_network, &kNetworkConfigurationSignature)); |
| 81 | 81 |
| 82 EXPECT_TRUE(test_utils::Equals(onc_network.get(), translation.get())); | 82 EXPECT_TRUE(test_utils::Equals(onc_network.get(), translation.get())); |
| 83 } | 83 } |
| 84 | 84 |
| 85 } // namespace onc | 85 } // namespace onc |
| 86 } // namespace chromeos | 86 } // namespace chromeos |
| OLD | NEW |