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

Unified Diff: chrome/browser/chromeos/net/onc_utils_unittest.cc

Issue 13454006: Moving ManagedNetworkConfigurationHandler to chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up parsing of NetworkUIData. Created 7 years, 8 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/net/onc_utils.cc ('k') | chrome/browser/chromeos/options/network_config_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/net/onc_utils_unittest.cc
diff --git a/chrome/browser/chromeos/net/onc_utils_unittest.cc b/chrome/browser/chromeos/net/onc_utils_unittest.cc
index dd341aa9450b16e10686e828cd9415b06f80f228..9a84b4bb826b9b05b9772da5013692bb9042c903 100644
--- a/chrome/browser/chromeos/net/onc_utils_unittest.cc
+++ b/chrome/browser/chromeos/net/onc_utils_unittest.cc
@@ -6,11 +6,10 @@
#include <string>
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
-#include "chrome/browser/chromeos/cros/network_ui_data.h"
#include "chrome/browser/google_apis/test_util.h"
+#include "chromeos/network/network_ui_data.h"
#include "chromeos/network/onc/onc_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -45,42 +44,5 @@ TEST(ONCUtils, ProxySettingsToProxyConfig) {
}
}
-class ONCCreateUIDataTest
- : public ::testing::TestWithParam<std::pair<std::string, std::string> > {
-};
-
-TEST_P(ONCCreateUIDataTest, CreateUIData) {
- scoped_ptr<base::DictionaryValue> onc_network =
- test_utils::ReadTestDictionary(GetParam().first);
-
- scoped_ptr<base::Value> expected_uidata =
- google_apis::test_util::LoadJSONFile(GetParam().second);
- const base::DictionaryValue* expected_uidata_dict;
- expected_uidata->GetAsDictionary(&expected_uidata_dict);
-
- scoped_ptr<NetworkUIData> actual_uidata =
- CreateUIData(ONC_SOURCE_USER_POLICY, *onc_network);
- EXPECT_TRUE(actual_uidata != NULL);
-
- base::DictionaryValue actual_uidata_dict;
- actual_uidata->FillDictionary(&actual_uidata_dict);
- EXPECT_TRUE(test_utils::Equals(&actual_uidata_dict, expected_uidata_dict));
-}
-
-INSTANTIATE_TEST_CASE_P(
- ONCCreateUIDataTest,
- ONCCreateUIDataTest,
- ::testing::Values(
- std::make_pair("valid_wifi_clientcert.onc",
- "chromeos/net/uidata_for_wifi_clientcert.json"),
- std::make_pair("valid_wifi_clientref.onc",
- "chromeos/net/uidata_for_wifi_clientref.json"),
- std::make_pair("valid_wifi_psk.onc",
- "chromeos/net/uidata_for_wifi_psk.json"),
- std::make_pair("valid_openvpn_clientcert.onc",
- "chromeos/net/uidata_for_openvpn_clientcert.json"),
- std::make_pair("valid_l2tpipsec_clientcert.onc",
- "chromeos/net/uidata_for_l2tpipsec_clientcert.json")));
-
} // namespace onc
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/net/onc_utils.cc ('k') | chrome/browser/chromeos/options/network_config_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698