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

Side by Side Diff: chrome/browser/policy/cloud/cloud_policy_browsertest.cc

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 years, 1 month 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 <memory> 5 #include <memory>
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 return base::StringPrintf(kTestPolicy, 144 return base::StringPrintf(kTestPolicy,
145 dm_protocol::kChromeUserPolicyType, 145 dm_protocol::kChromeUserPolicyType,
146 homepage, 146 homepage,
147 GetTestUser(), 147 GetTestUser(),
148 key_version); 148 key_version);
149 } 149 }
150 150
151 void GetExpectedDefaultPolicy(PolicyMap* policy_map) { 151 void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
152 policy_map->Set(key::kNTPContentSuggestionsEnabled, POLICY_LEVEL_MANDATORY, 152 policy_map->Set(key::kNTPContentSuggestionsEnabled, POLICY_LEVEL_MANDATORY,
153 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT, 153 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
154 base::WrapUnique(new base::FundamentalValue(false)), nullptr); 154 base::WrapUnique(new base::Value(false)), nullptr);
155 #if defined(OS_CHROMEOS) 155 #if defined(OS_CHROMEOS)
156 policy_map->Set(key::kChromeOsMultiProfileUserBehavior, 156 policy_map->Set(key::kChromeOsMultiProfileUserBehavior,
157 POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 157 POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
158 POLICY_SOURCE_ENTERPRISE_DEFAULT, 158 POLICY_SOURCE_ENTERPRISE_DEFAULT,
159 base::MakeUnique<base::StringValue>("primary-only"), nullptr); 159 base::MakeUnique<base::StringValue>("primary-only"), nullptr);
160 policy_map->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY, 160 policy_map->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
161 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT, 161 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
162 base::MakeUnique<base::FundamentalValue>(false), nullptr); 162 base::MakeUnique<base::Value>(false), nullptr);
163 policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy, 163 policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
164 POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 164 POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
165 POLICY_SOURCE_ENTERPRISE_DEFAULT, 165 POLICY_SOURCE_ENTERPRISE_DEFAULT,
166 base::MakeUnique<base::FundamentalValue>(false), nullptr); 166 base::MakeUnique<base::Value>(false), nullptr);
167 policy_map->Set(key::kAllowDinosaurEasterEgg, POLICY_LEVEL_MANDATORY, 167 policy_map->Set(key::kAllowDinosaurEasterEgg, POLICY_LEVEL_MANDATORY,
168 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT, 168 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
169 base::MakeUnique<base::FundamentalValue>(false), nullptr); 169 base::MakeUnique<base::Value>(false), nullptr);
170 policy_map->Set(key::kArcEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 170 policy_map->Set(key::kArcEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
171 POLICY_SOURCE_ENTERPRISE_DEFAULT, 171 POLICY_SOURCE_ENTERPRISE_DEFAULT,
172 base::MakeUnique<base::FundamentalValue>(false), nullptr); 172 base::MakeUnique<base::Value>(false), nullptr);
173 policy_map->Set(key::kPacHttpsUrlStrippingEnabled, POLICY_LEVEL_MANDATORY, 173 policy_map->Set(key::kPacHttpsUrlStrippingEnabled, POLICY_LEVEL_MANDATORY,
174 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT, 174 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
175 base::MakeUnique<base::FundamentalValue>(false), nullptr); 175 base::MakeUnique<base::Value>(false), nullptr);
176 #endif 176 #endif
177 } 177 }
178 178
179 void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) { 179 void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
180 GetExpectedDefaultPolicy(expected); 180 GetExpectedDefaultPolicy(expected);
181 181
182 expected->Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 182 expected->Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
183 POLICY_SOURCE_CLOUD, 183 POLICY_SOURCE_CLOUD,
184 base::MakeUnique<base::FundamentalValue>(true), nullptr); 184 base::MakeUnique<base::Value>(true), nullptr);
185 expected->Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY, 185 expected->Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY,
186 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, 186 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
187 base::MakeUnique<base::FundamentalValue>(4), nullptr); 187 base::MakeUnique<base::Value>(4), nullptr);
188 base::ListValue list; 188 base::ListValue list;
189 list.AppendString("dev.chromium.org"); 189 list.AppendString("dev.chromium.org");
190 list.AppendString("youtube.com"); 190 list.AppendString("youtube.com");
191 expected->Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 191 expected->Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
192 POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); 192 POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
193 expected->Set(key::kMaxInvalidationFetchDelay, POLICY_LEVEL_MANDATORY, 193 expected->Set(key::kMaxInvalidationFetchDelay, POLICY_LEVEL_MANDATORY,
194 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, 194 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
195 base::MakeUnique<base::FundamentalValue>(1000), nullptr); 195 base::MakeUnique<base::Value>(1000), nullptr);
196 expected->Set(key::kHomepageLocation, POLICY_LEVEL_RECOMMENDED, 196 expected->Set(key::kHomepageLocation, POLICY_LEVEL_RECOMMENDED,
197 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, 197 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
198 base::MakeUnique<base::StringValue>(homepage), nullptr); 198 base::MakeUnique<base::StringValue>(homepage), nullptr);
199 } 199 }
200 200
201 } // namespace 201 } // namespace
202 202
203 // Tests the cloud policy stack(s). 203 // Tests the cloud policy stack(s).
204 class CloudPolicyTest : public InProcessBrowserTest, 204 class CloudPolicyTest : public InProcessBrowserTest,
205 public PolicyService::Observer { 205 public PolicyService::Observer {
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 494
495 // They should now serialize to the same bytes. 495 // They should now serialize to the same bytes.
496 std::string chrome_settings_serialized; 496 std::string chrome_settings_serialized;
497 std::string cloud_policy_serialized; 497 std::string cloud_policy_serialized;
498 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized)); 498 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized));
499 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized)); 499 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized));
500 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized); 500 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized);
501 } 501 }
502 502
503 } // namespace policy 503 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_policy_handler.cc ('k') | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698