Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.

chrome/browser/chromeos/cros/network_property_ui_data_unittest.cc

Index: chrome/browser/chromeos/cros/network_property_ui_data_unittest.cc
diff --git a/chrome/browser/chromeos/cros/network_property_ui_data_unittest.cc b/chrome/browser/chromeos/cros/network_property_ui_data_unittest.cc
index 3cadc2aaa99098f6a964cec8c35e558f12fea081..6e67e3593d91b9ddfe7de587bbc40ca58b13bf29 100644
--- a/chrome/browser/chromeos/cros/network_property_ui_data_unittest.cc
+++ b/chrome/browser/chromeos/cros/network_property_ui_data_unittest.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/cros/network_property_ui_data.h"
 
 #include "base/values.h"
-#include "chromeos/network/network_ui_data.h"
+#include "chromeos/network/onc/onc_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
@@ -36,21 +36,11 @@ TEST_F(NetworkUIDataTest, PropertyInit) {
   NetworkPropertyUIData empty_prop;
   CheckProperty(empty_prop, NULL, false, false, true);
 
-  NetworkUIData empty_data;
-  NetworkPropertyUIData null_prop(empty_data);
+  NetworkPropertyUIData null_prop(onc::ONC_SOURCE_NONE);
   CheckProperty(null_prop, NULL, false, false, true);
-
-  base::DictionaryValue empty_dict;
-  NetworkUIData empty_data_2(empty_dict);
-  NetworkPropertyUIData empty_dict_prop(empty_data_2);
-  CheckProperty(empty_dict_prop, NULL, false, false, true);
-
 }
 
 TEST_F(NetworkUIDataTest, ParseOncProperty) {
-  base::DictionaryValue ui_data_dict;
-  NetworkUIData ui_data;
-
   base::DictionaryValue onc;
 
   base::StringValue val_a("a");
@@ -63,58 +53,55 @@ TEST_F(NetworkUIDataTest, ParseOncProperty) {
   onc.Set("a.a", val_a_a.DeepCopy());
   onc.Set("a.b", val_a_b.DeepCopy());
   base::ListValue recommended;
-  recommended.Append(new base::StringValue("b"));
-  recommended.Append(new base::StringValue("c"));
-  recommended.Append(new base::StringValue("a.a"));
+  recommended.AppendString("b");
+  recommended.AppendString("c");
+  recommended.AppendString("a.a");
   onc.Set("Recommended", recommended.DeepCopy());
   onc.Set("a.Recommended", recommended.DeepCopy());
 
   NetworkPropertyUIData prop;
 
-  ui_data.set_onc_source(onc::ONC_SOURCE_USER_IMPORT);
-  ui_data.FillDictionary(&ui_data_dict);
-
-  NetworkUIData empty_data;
-  prop.ParseOncProperty(empty_data, &onc, "a");
+  prop.ParseOncProperty(onc::ONC_SOURCE_NONE, &onc, "a");
   CheckProperty(prop, NULL, false, false, true);
 
-  prop.ParseOncProperty(ui_data, &onc, "a");
+  onc::ONCSource source = onc::ONC_SOURCE_USER_IMPORT;
+
+  prop.ParseOncProperty(source, &onc, "a");
   CheckProperty(prop, NULL, false, false, true);
 
-  prop.ParseOncProperty(ui_data, &onc, "a.b");
+  prop.ParseOncProperty(source, &onc, "a.b");
   CheckProperty(prop, NULL, false, false, true);
 
-  prop.ParseOncProperty(ui_data, &onc, "c");
+  prop.ParseOncProperty(source, &onc, "c");
   CheckProperty(prop, NULL, false, false, true);
 
-  ui_data.set_onc_source(onc::ONC_SOURCE_USER_POLICY);
-  ui_data.FillDictionary(&ui_data_dict);
+  source = onc::ONC_SOURCE_USER_POLICY;
 
-  prop.ParseOncProperty(ui_data, &onc, "a");
+  prop.ParseOncProperty(source, &onc, "a");
   CheckProperty(prop, NULL, true, false, false);
 
-  prop.ParseOncProperty(ui_data, &onc, "b");
+  prop.ParseOncProperty(source, &onc, "b");
   CheckProperty(prop, &val_b, false, true, true);
 
-  prop.ParseOncProperty(ui_data, &onc, "c");
+  prop.ParseOncProperty(source, &onc, "c");
   CheckProperty(prop, NULL, false, false, true);
 
-  prop.ParseOncProperty(ui_data, &onc, "d");
+  prop.ParseOncProperty(source, &onc, "d");
   CheckProperty(prop, NULL, true, false, false);
 
-  prop.ParseOncProperty(ui_data, &onc, "a.a");
+  prop.ParseOncProperty(source, &onc, "a.a");
   CheckProperty(prop, NULL, true, false, false);
 
-  prop.ParseOncProperty(ui_data, &onc, "a.b");
+  prop.ParseOncProperty(source, &onc, "a.b");
   CheckProperty(prop, &val_a_b, false, true, true);
 
-  prop.ParseOncProperty(ui_data, &onc, "a.c");
+  prop.ParseOncProperty(source, &onc, "a.c");
   CheckProperty(prop, NULL, false, false, true);
 
-  prop.ParseOncProperty(ui_data, &onc, "a.d");
+  prop.ParseOncProperty(source, &onc, "a.d");
   CheckProperty(prop, NULL, true, false, false);
 
-  prop.ParseOncProperty(ui_data, NULL, "a.e");
+  prop.ParseOncProperty(source, NULL, "a.e");
   CheckProperty(prop, NULL, true, false, false);
 }