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

Side by Side Diff: chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc

Issue 2392693002: Rewrite simple uses of base::ListValue::Append(base::Value*) on CrOS. (Closed)
Patch Set: MakeUnique Created 4 years, 2 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 (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/policy/configuration_policy_handler_chromeos.h " 5 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h "
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 PinnedLauncherAppsPolicyHandler handler; 311 PinnedLauncherAppsPolicyHandler handler;
312 312
313 policy_map.Set(key::kPinnedLauncherApps, POLICY_LEVEL_MANDATORY, 313 policy_map.Set(key::kPinnedLauncherApps, POLICY_LEVEL_MANDATORY,
314 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), 314 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, list.CreateDeepCopy(),
315 nullptr); 315 nullptr);
316 handler.ApplyPolicySettings(policy_map, &prefs); 316 handler.ApplyPolicySettings(policy_map, &prefs);
317 EXPECT_TRUE(prefs.GetValue(prefs::kPolicyPinnedLauncherApps, &value)); 317 EXPECT_TRUE(prefs.GetValue(prefs::kPolicyPinnedLauncherApps, &value));
318 EXPECT_TRUE(base::Value::Equals(&expected_pinned_apps, value)); 318 EXPECT_TRUE(base::Value::Equals(&expected_pinned_apps, value));
319 319
320 base::StringValue entry1("abcdefghijklmnopabcdefghijklmnop"); 320 base::StringValue entry1("abcdefghijklmnopabcdefghijklmnop");
321 base::DictionaryValue* entry1_dict = new base::DictionaryValue(); 321 auto entry1_dict = base::MakeUnique<base::DictionaryValue>();
322 entry1_dict->Set(ash::launcher::kPinnedAppsPrefAppIDPath, entry1.DeepCopy()); 322 entry1_dict->Set(ash::launcher::kPinnedAppsPrefAppIDPath, entry1.DeepCopy());
323 expected_pinned_apps.Append(entry1_dict); 323 expected_pinned_apps.Append(std::move(entry1_dict));
324 list.Append(entry1.DeepCopy()); 324 list.Append(entry1.DeepCopy());
325 policy_map.Set(key::kPinnedLauncherApps, POLICY_LEVEL_MANDATORY, 325 policy_map.Set(key::kPinnedLauncherApps, POLICY_LEVEL_MANDATORY,
326 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), 326 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, list.CreateDeepCopy(),
327 nullptr); 327 nullptr);
328 prefs.Clear(); 328 prefs.Clear();
329 handler.ApplyPolicySettings(policy_map, &prefs); 329 handler.ApplyPolicySettings(policy_map, &prefs);
330 EXPECT_TRUE(prefs.GetValue(prefs::kPolicyPinnedLauncherApps, &value)); 330 EXPECT_TRUE(prefs.GetValue(prefs::kPolicyPinnedLauncherApps, &value));
331 EXPECT_TRUE(base::Value::Equals(&expected_pinned_apps, value)); 331 EXPECT_TRUE(base::Value::Equals(&expected_pinned_apps, value));
332 } 332 }
333 333
(...skipping 23 matching lines...) Expand all
357 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, 357 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
358 base::MakeUnique<base::FundamentalValue>(false), nullptr); 358 base::MakeUnique<base::FundamentalValue>(false), nullptr);
359 LoginScreenPowerManagementPolicyHandler handler(chrome_schema_); 359 LoginScreenPowerManagementPolicyHandler handler(chrome_schema_);
360 PolicyErrorMap errors; 360 PolicyErrorMap errors;
361 EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors)); 361 EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
362 EXPECT_FALSE( 362 EXPECT_FALSE(
363 errors.GetErrors(key::kDeviceLoginScreenPowerManagement).empty()); 363 errors.GetErrors(key::kDeviceLoginScreenPowerManagement).empty());
364 } 364 }
365 365
366 } // namespace policy 366 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698