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

Side by Side Diff: chromeos/network/onc/onc_translator_unittest.cc

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit tests Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/network/onc/onc_translator_shill_to_onc.cc ('k') | chromeos/network/onc/onc_utils.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/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/onc_constants.h"
10 #include "chrome/browser/chromeos/network_settings/onc_signature.h" 10 #include "chromeos/network/onc/onc_signature.h"
11 #include "chrome/browser/chromeos/network_settings/onc_test_utils.h" 11 #include "chromeos/network/onc/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
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
OLDNEW
« no previous file with comments | « chromeos/network/onc/onc_translator_shill_to_onc.cc ('k') | chromeos/network/onc/onc_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698