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

Unified Diff: chrome/browser/chromeos/cros/network_ui_data_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/cros/network_ui_data.cc ('k') | chrome/browser/chromeos/cros/onc_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/cros/network_ui_data_unittest.cc
diff --git a/chrome/browser/chromeos/cros/network_ui_data_unittest.cc b/chrome/browser/chromeos/cros/network_ui_data_unittest.cc
index 6a3440613ff0f0c93357123438192652ed7cb99a..b019db0d67523813c9aad673f1b22ffab29f031e 100644
--- a/chrome/browser/chromeos/cros/network_ui_data_unittest.cc
+++ b/chrome/browser/chromeos/cros/network_ui_data_unittest.cc
@@ -35,21 +35,20 @@ TEST_F(NetworkUIDataTest, ONCSource) {
ui_data_dict.SetString(NetworkUIData::kKeyONCSource, "user_import");
{
NetworkUIData ui_data(ui_data_dict);
- EXPECT_EQ(NetworkUIData::ONC_SOURCE_USER_IMPORT,
- ui_data.onc_source());
+ EXPECT_EQ(onc::ONC_SOURCE_USER_IMPORT, ui_data.onc_source());
EXPECT_FALSE(ui_data.is_managed());
}
ui_data_dict.SetString(NetworkUIData::kKeyONCSource, "device_policy");
{
NetworkUIData ui_data(ui_data_dict);
- EXPECT_EQ(NetworkUIData::ONC_SOURCE_DEVICE_POLICY, ui_data.onc_source());
+ EXPECT_EQ(onc::ONC_SOURCE_DEVICE_POLICY, ui_data.onc_source());
EXPECT_TRUE(ui_data.is_managed());
}
ui_data_dict.SetString(NetworkUIData::kKeyONCSource, "user_policy");
{
NetworkUIData ui_data(ui_data_dict);
- EXPECT_EQ(NetworkUIData::ONC_SOURCE_USER_POLICY, ui_data.onc_source());
+ EXPECT_EQ(onc::ONC_SOURCE_USER_POLICY, ui_data.onc_source());
EXPECT_TRUE(ui_data.is_managed());
}
}
@@ -135,7 +134,7 @@ TEST_F(NetworkUIDataTest, ParseOncProperty) {
NetworkPropertyUIData prop;
- ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_USER_IMPORT);
+ ui_data.set_onc_source(onc::ONC_SOURCE_USER_IMPORT);
ui_data.FillDictionary(&ui_data_dict);
NetworkUIData empty_data;
@@ -151,7 +150,7 @@ TEST_F(NetworkUIDataTest, ParseOncProperty) {
prop.ParseOncProperty(ui_data, &onc, "c");
CheckProperty(prop, NULL, false, false, true);
- ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_USER_POLICY);
+ ui_data.set_onc_source(onc::ONC_SOURCE_USER_POLICY);
ui_data.FillDictionary(&ui_data_dict);
prop.ParseOncProperty(ui_data, &onc, "a");
« no previous file with comments | « chrome/browser/chromeos/cros/network_ui_data.cc ('k') | chrome/browser/chromeos/cros/onc_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698