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

Side by Side Diff: chrome/browser/policy/cloud_policy_provider_unittest.cc

Issue 7619006: base: Remove using declaration of FundamentalValue as it's no longer necessary. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/policy/cloud_policy_provider.h" 5 #include "chrome/browser/policy/cloud_policy_provider.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/policy/cloud_policy_cache_base.h" 9 #include "chrome/browser/policy/cloud_policy_cache_base.h"
10 #include "chrome/browser/policy/cloud_policy_provider_impl.h" 10 #include "chrome/browser/policy/cloud_policy_provider_impl.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 // Combining two PolicyMaps. 168 // Combining two PolicyMaps.
169 TEST_F(CloudPolicyProviderTest, CombineTwoPolicyMapsSame) { 169 TEST_F(CloudPolicyProviderTest, CombineTwoPolicyMapsSame) {
170 PolicyMap A, B, C; 170 PolicyMap A, B, C;
171 CreateCloudPolicyProvider(CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED); 171 CreateCloudPolicyProvider(CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED);
172 A.Set(kPolicyHomepageLocation, 172 A.Set(kPolicyHomepageLocation,
173 Value::CreateStringValue("http://www.chromium.org")); 173 Value::CreateStringValue("http://www.chromium.org"));
174 B.Set(kPolicyHomepageLocation, 174 B.Set(kPolicyHomepageLocation,
175 Value::CreateStringValue("http://www.google.com")); 175 Value::CreateStringValue("http://www.google.com"));
176 A.Set(kPolicyApplicationLocaleValue, Value::CreateStringValue("hu")); 176 A.Set(kPolicyApplicationLocaleValue, Value::CreateStringValue("hu"));
177 B.Set(kPolicyApplicationLocaleValue, Value::CreateStringValue("us")); 177 B.Set(kPolicyApplicationLocaleValue, Value::CreateStringValue("us"));
178 A.Set(kPolicyDevicePolicyRefreshRate, new FundamentalValue(100)); 178 A.Set(kPolicyDevicePolicyRefreshRate, new base::FundamentalValue(100));
179 B.Set(kPolicyDevicePolicyRefreshRate, new FundamentalValue(200)); 179 B.Set(kPolicyDevicePolicyRefreshRate, new base::FundamentalValue(200));
180 CombineTwoPolicyMaps(A, B, &C); 180 CombineTwoPolicyMaps(A, B, &C);
181 EXPECT_TRUE(A.Equals(C)); 181 EXPECT_TRUE(A.Equals(C));
182 } 182 }
183 183
184 TEST_F(CloudPolicyProviderTest, CombineTwoPolicyMapsEmpty) { 184 TEST_F(CloudPolicyProviderTest, CombineTwoPolicyMapsEmpty) {
185 PolicyMap A, B, C; 185 PolicyMap A, B, C;
186 CreateCloudPolicyProvider(CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED); 186 CreateCloudPolicyProvider(CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED);
187 CombineTwoPolicyMaps(A, B, &C); 187 CombineTwoPolicyMaps(A, B, &C);
188 EXPECT_TRUE(C.empty()); 188 EXPECT_TRUE(C.empty());
189 } 189 }
190 190
191 TEST_F(CloudPolicyProviderTest, CombineTwoPolicyMapsPartial) { 191 TEST_F(CloudPolicyProviderTest, CombineTwoPolicyMapsPartial) {
192 PolicyMap A, B, C; 192 PolicyMap A, B, C;
193 CreateCloudPolicyProvider(CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED); 193 CreateCloudPolicyProvider(CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED);
194 194
195 A.Set(kPolicyHomepageLocation, 195 A.Set(kPolicyHomepageLocation,
196 Value::CreateStringValue("http://www.chromium.org")); 196 Value::CreateStringValue("http://www.chromium.org"));
197 B.Set(kPolicyHomepageLocation, 197 B.Set(kPolicyHomepageLocation,
198 Value::CreateStringValue("http://www.google.com")); 198 Value::CreateStringValue("http://www.google.com"));
199 B.Set(kPolicyApplicationLocaleValue, Value::CreateStringValue("us")); 199 B.Set(kPolicyApplicationLocaleValue, Value::CreateStringValue("us"));
200 A.Set(kPolicyDevicePolicyRefreshRate, new FundamentalValue(100)); 200 A.Set(kPolicyDevicePolicyRefreshRate, new base::FundamentalValue(100));
201 B.Set(kPolicyDevicePolicyRefreshRate, new FundamentalValue(200)); 201 B.Set(kPolicyDevicePolicyRefreshRate, new base::FundamentalValue(200));
202 CombineTwoPolicyMaps(A, B, &C); 202 CombineTwoPolicyMaps(A, B, &C);
203 203
204 const Value* value; 204 const Value* value;
205 std::string string_value; 205 std::string string_value;
206 int int_value; 206 int int_value;
207 value = C.Get(kPolicyHomepageLocation); 207 value = C.Get(kPolicyHomepageLocation);
208 ASSERT_TRUE(NULL != value); 208 ASSERT_TRUE(NULL != value);
209 EXPECT_TRUE(value->GetAsString(&string_value)); 209 EXPECT_TRUE(value->GetAsString(&string_value));
210 EXPECT_EQ("http://www.chromium.org", string_value); 210 EXPECT_EQ("http://www.chromium.org", string_value);
211 value = C.Get(kPolicyApplicationLocaleValue); 211 value = C.Get(kPolicyApplicationLocaleValue);
(...skipping 19 matching lines...) Expand all
231 B.Set(policy::kPolicyProxyPacUrl, Value::CreateIntegerValue(b_value)); 231 B.Set(policy::kPolicyProxyPacUrl, Value::CreateIntegerValue(b_value));
232 B.Set(policy::kPolicyProxyBypassList, Value::CreateIntegerValue(b_value)); 232 B.Set(policy::kPolicyProxyBypassList, Value::CreateIntegerValue(b_value));
233 233
234 CombineTwoPolicyMaps(A, B, &C); 234 CombineTwoPolicyMaps(A, B, &C);
235 235
236 EXPECT_TRUE(A.Equals(C)); 236 EXPECT_TRUE(A.Equals(C));
237 EXPECT_FALSE(B.Equals(C)); 237 EXPECT_FALSE(B.Equals(C));
238 } 238 }
239 239
240 } // namespace policy 240 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698