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

Side by Side Diff: components/policy/core/common/schema_map_unittest.cc

Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad merge Created 5 years, 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "components/policy/core/common/schema_map.h" 5 #include "components/policy/core/common/schema_map.h"
6 6
7 #include "base/memory/weak_ptr.h" 7 #include "base/memory/weak_ptr.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "components/policy/core/common/external_data_fetcher.h" 9 #include "components/policy/core/common/external_data_fetcher.h"
10 #include "components/policy/core/common/external_data_manager.h" 10 #include "components/policy/core/common/external_data_manager.h"
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 POLICY_LEVEL_MANDATORY, 166 POLICY_LEVEL_MANDATORY,
167 POLICY_SCOPE_USER, 167 POLICY_SCOPE_USER,
168 new base::FundamentalValue(true), 168 new base::FundamentalValue(true),
169 NULL); 169 NULL);
170 map.Set("integer", 170 map.Set("integer",
171 POLICY_LEVEL_MANDATORY, 171 POLICY_LEVEL_MANDATORY,
172 POLICY_SCOPE_USER, 172 POLICY_SCOPE_USER,
173 new base::FundamentalValue(1), 173 new base::FundamentalValue(1),
174 NULL); 174 NULL);
175 map.Set("null", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 175 map.Set("null", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
176 base::Value::CreateNullValue(), NULL); 176 base::Value::CreateNullValue().release(), NULL);
177 map.Set("double", 177 map.Set("double",
178 POLICY_LEVEL_MANDATORY, 178 POLICY_LEVEL_MANDATORY,
179 POLICY_SCOPE_USER, 179 POLICY_SCOPE_USER,
180 new base::FundamentalValue(1.2), 180 new base::FundamentalValue(1.2),
181 NULL); 181 NULL);
182 base::DictionaryValue dict; 182 base::DictionaryValue dict;
183 dict.SetString("a", "b"); 183 dict.SetString("a", "b");
184 dict.SetInteger("b", 2); 184 dict.SetInteger("b", 2);
185 map.Set("object", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 185 map.Set("object", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
186 dict.DeepCopy(), NULL); 186 dict.DeepCopy(), NULL);
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 newer = new SchemaMap(map); 333 newer = new SchemaMap(map);
334 newer->GetChanges(older, &removed, &added); 334 newer->GetChanges(older, &removed, &added);
335 ASSERT_EQ(2u, removed.size()); 335 ASSERT_EQ(2u, removed.size());
336 EXPECT_EQ(PolicyNamespace(POLICY_DOMAIN_CHROME, ""), removed[0]); 336 EXPECT_EQ(PolicyNamespace(POLICY_DOMAIN_CHROME, ""), removed[0]);
337 EXPECT_EQ(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "xyz"), removed[1]); 337 EXPECT_EQ(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "xyz"), removed[1]);
338 ASSERT_EQ(1u, added.size()); 338 ASSERT_EQ(1u, added.size());
339 EXPECT_EQ(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "abc"), added[0]); 339 EXPECT_EQ(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "abc"), added[0]);
340 } 340 }
341 341
342 } // namespace policy 342 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698