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

Side by Side Diff: chrome/browser/chromeos/cros/network_ui_data_unittest.cc

Issue 11369258: Revert 167808 - Get rid of use of CreateStringValue in chromeos/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
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/cros/network_ui_data.h" 5 #include "chrome/browser/chromeos/cros/network_ui_data.h"
6 #include "testing/gtest/include/gtest/gtest.h" 6 #include "testing/gtest/include/gtest/gtest.h"
7 7
8 namespace chromeos { 8 namespace chromeos {
9 9
10 class NetworkUIDataTest : public testing::Test { 10 class NetworkUIDataTest : public testing::Test {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 base::StringValue val_a("a"); 120 base::StringValue val_a("a");
121 base::StringValue val_b("b"); 121 base::StringValue val_b("b");
122 base::StringValue val_a_a("a_a"); 122 base::StringValue val_a_a("a_a");
123 base::StringValue val_a_b("a_b"); 123 base::StringValue val_a_b("a_b");
124 124
125 onc.Set("a", val_a.DeepCopy()); 125 onc.Set("a", val_a.DeepCopy());
126 onc.Set("b", val_b.DeepCopy()); 126 onc.Set("b", val_b.DeepCopy());
127 onc.Set("a.a", val_a_a.DeepCopy()); 127 onc.Set("a.a", val_a_a.DeepCopy());
128 onc.Set("a.b", val_a_b.DeepCopy()); 128 onc.Set("a.b", val_a_b.DeepCopy());
129 base::ListValue recommended; 129 base::ListValue recommended;
130 recommended.Append(new base::StringValue("b")); 130 recommended.Append(base::Value::CreateStringValue("b"));
131 recommended.Append(new base::StringValue("c")); 131 recommended.Append(base::Value::CreateStringValue("c"));
132 recommended.Append(new base::StringValue("a.a")); 132 recommended.Append(base::Value::CreateStringValue("a.a"));
133 onc.Set("Recommended", recommended.DeepCopy()); 133 onc.Set("Recommended", recommended.DeepCopy());
134 onc.Set("a.Recommended", recommended.DeepCopy()); 134 onc.Set("a.Recommended", recommended.DeepCopy());
135 135
136 NetworkPropertyUIData prop; 136 NetworkPropertyUIData prop;
137 137
138 ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_USER_IMPORT); 138 ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_USER_IMPORT);
139 ui_data.FillDictionary(&ui_data_dict); 139 ui_data.FillDictionary(&ui_data_dict);
140 140
141 NetworkUIData empty_data; 141 NetworkUIData empty_data;
142 prop.ParseOncProperty(empty_data, &onc, "a"); 142 prop.ParseOncProperty(empty_data, &onc, "a");
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 CheckProperty(prop, NULL, false, false, true); 176 CheckProperty(prop, NULL, false, false, true);
177 177
178 prop.ParseOncProperty(ui_data, &onc, "a.d"); 178 prop.ParseOncProperty(ui_data, &onc, "a.d");
179 CheckProperty(prop, NULL, true, false, false); 179 CheckProperty(prop, NULL, true, false, false);
180 180
181 prop.ParseOncProperty(ui_data, NULL, "a.e"); 181 prop.ParseOncProperty(ui_data, NULL, "a.e");
182 CheckProperty(prop, NULL, true, false, false); 182 CheckProperty(prop, NULL, true, false, false);
183 } 183 }
184 184
185 } // namespace chromeos 185 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.cc ('k') | chrome/browser/chromeos/extensions/echo_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698