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

Side by Side Diff: components/prefs/pref_service_unittest.cc

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « components/prefs/pref_service.cc ('k') | components/prefs/pref_value_map.cc » ('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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 EXPECT_EQ(base::Value::Type::INTEGER, value->GetType()); 171 EXPECT_EQ(base::Value::Type::INTEGER, value->GetType());
172 int actual_int_value = -1; 172 int actual_int_value = -1;
173 EXPECT_TRUE(value->GetAsInteger(&actual_int_value)); 173 EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
174 EXPECT_EQ(kDefaultValue, actual_int_value); 174 EXPECT_EQ(kDefaultValue, actual_int_value);
175 175
176 // Check that GetRecommendedValue() returns no value. 176 // Check that GetRecommendedValue() returns no value.
177 value = pref->GetRecommendedValue(); 177 value = pref->GetRecommendedValue();
178 ASSERT_FALSE(value); 178 ASSERT_FALSE(value);
179 179
180 // Set a user-set value. 180 // Set a user-set value.
181 prefs.SetUserPref(kPrefName, new base::FundamentalValue(kUserValue)); 181 prefs.SetUserPref(kPrefName, new base::Value(kUserValue));
182 182
183 // Check that GetValue() returns the user-set value. 183 // Check that GetValue() returns the user-set value.
184 value = pref->GetValue(); 184 value = pref->GetValue();
185 ASSERT_TRUE(value); 185 ASSERT_TRUE(value);
186 EXPECT_EQ(base::Value::Type::INTEGER, value->GetType()); 186 EXPECT_EQ(base::Value::Type::INTEGER, value->GetType());
187 actual_int_value = -1; 187 actual_int_value = -1;
188 EXPECT_TRUE(value->GetAsInteger(&actual_int_value)); 188 EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
189 EXPECT_EQ(kUserValue, actual_int_value); 189 EXPECT_EQ(kUserValue, actual_int_value);
190 190
191 // Check that GetRecommendedValue() returns no value. 191 // Check that GetRecommendedValue() returns no value.
192 value = pref->GetRecommendedValue(); 192 value = pref->GetRecommendedValue();
193 ASSERT_FALSE(value); 193 ASSERT_FALSE(value);
194 194
195 // Set a recommended value. 195 // Set a recommended value.
196 prefs.SetRecommendedPref(kPrefName, 196 prefs.SetRecommendedPref(kPrefName, new base::Value(kRecommendedValue));
197 new base::FundamentalValue(kRecommendedValue));
198 197
199 // Check that GetValue() returns the user-set value. 198 // Check that GetValue() returns the user-set value.
200 value = pref->GetValue(); 199 value = pref->GetValue();
201 ASSERT_TRUE(value); 200 ASSERT_TRUE(value);
202 EXPECT_EQ(base::Value::Type::INTEGER, value->GetType()); 201 EXPECT_EQ(base::Value::Type::INTEGER, value->GetType());
203 actual_int_value = -1; 202 actual_int_value = -1;
204 EXPECT_TRUE(value->GetAsInteger(&actual_int_value)); 203 EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
205 EXPECT_EQ(kUserValue, actual_int_value); 204 EXPECT_EQ(kUserValue, actual_int_value);
206 205
207 // Check that GetRecommendedValue() returns the recommended value. 206 // Check that GetRecommendedValue() returns the recommended value.
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 420
422 EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0); 421 EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0);
423 prefs_.Set(kName, new_value); 422 prefs_.Set(kName, new_value);
424 Mock::VerifyAndClearExpectations(&observer_); 423 Mock::VerifyAndClearExpectations(&observer_);
425 424
426 base::ListValue empty; 425 base::ListValue empty;
427 observer_.Expect(kName, &empty); 426 observer_.Expect(kName, &empty);
428 prefs_.Set(kName, empty); 427 prefs_.Set(kName, empty);
429 Mock::VerifyAndClearExpectations(&observer_); 428 Mock::VerifyAndClearExpectations(&observer_);
430 } 429 }
OLDNEW
« no previous file with comments | « components/prefs/pref_service.cc ('k') | components/prefs/pref_value_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698