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

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

Issue 2334613003: Re-write many calls to WrapUnique() with MakeUnique() (Closed)
Patch Set: Changes from review by sky Created 4 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/profile_policy_connector.h" 5 #include "chrome/browser/policy/profile_policy_connector.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // No policy is set initially. 92 // No policy is set initially.
93 EXPECT_FALSE( 93 EXPECT_FALSE(
94 connector.IsPolicyFromCloudPolicy(autofill::prefs::kAutofillEnabled)); 94 connector.IsPolicyFromCloudPolicy(autofill::prefs::kAutofillEnabled));
95 PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, std::string()); 95 PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, std::string());
96 EXPECT_FALSE(connector.policy_service()->GetPolicies(chrome_ns).GetValue( 96 EXPECT_FALSE(connector.policy_service()->GetPolicies(chrome_ns).GetValue(
97 key::kAutoFillEnabled)); 97 key::kAutoFillEnabled));
98 98
99 // Set the policy at the cloud provider. 99 // Set the policy at the cloud provider.
100 cloud_policy_store_.policy_map_.Set( 100 cloud_policy_store_.policy_map_.Set(
101 key::kAutoFillEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 101 key::kAutoFillEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
102 POLICY_SOURCE_CLOUD, base::WrapUnique(new base::FundamentalValue(false)), 102 POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(false),
103 nullptr); 103 nullptr);
104 cloud_policy_store_.NotifyStoreLoaded(); 104 cloud_policy_store_.NotifyStoreLoaded();
105 base::RunLoop().RunUntilIdle(); 105 base::RunLoop().RunUntilIdle();
106 EXPECT_TRUE(connector.IsPolicyFromCloudPolicy(key::kAutoFillEnabled)); 106 EXPECT_TRUE(connector.IsPolicyFromCloudPolicy(key::kAutoFillEnabled));
107 const base::Value* value = 107 const base::Value* value =
108 connector.policy_service()->GetPolicies(chrome_ns).GetValue( 108 connector.policy_service()->GetPolicies(chrome_ns).GetValue(
109 key::kAutoFillEnabled); 109 key::kAutoFillEnabled);
110 ASSERT_TRUE(value); 110 ASSERT_TRUE(value);
111 EXPECT_TRUE(base::FundamentalValue(false).Equals(value)); 111 EXPECT_TRUE(base::FundamentalValue(false).Equals(value));
112 112
113 // Now test with a higher-priority provider also setting the policy. 113 // Now test with a higher-priority provider also setting the policy.
114 PolicyMap map; 114 PolicyMap map;
115 map.Set(key::kAutoFillEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 115 map.Set(key::kAutoFillEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
116 POLICY_SOURCE_CLOUD, 116 POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(true),
117 base::WrapUnique(new base::FundamentalValue(true)), nullptr); 117 nullptr);
118 mock_provider_.UpdateChromePolicy(map); 118 mock_provider_.UpdateChromePolicy(map);
119 EXPECT_FALSE(connector.IsPolicyFromCloudPolicy(key::kAutoFillEnabled)); 119 EXPECT_FALSE(connector.IsPolicyFromCloudPolicy(key::kAutoFillEnabled));
120 value = connector.policy_service()->GetPolicies(chrome_ns).GetValue( 120 value = connector.policy_service()->GetPolicies(chrome_ns).GetValue(
121 key::kAutoFillEnabled); 121 key::kAutoFillEnabled);
122 ASSERT_TRUE(value); 122 ASSERT_TRUE(value);
123 EXPECT_TRUE(base::FundamentalValue(true).Equals(value)); 123 EXPECT_TRUE(base::FundamentalValue(true).Equals(value));
124 124
125 // Cleanup. 125 // Cleanup.
126 connector.Shutdown(); 126 connector.Shutdown();
127 } 127 }
128 128
129 } // namespace policy 129 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_startup_browsertest.cc ('k') | chrome/browser/prefs/chrome_pref_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698