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

Unified Diff: chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

Issue 2172543003: Remove NetPrefObserver class and two prefs that do not do anything. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re: #17. Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
index 4903d8e7f824389087dc3b98e63c2154973d9514..4f7aec60c8c087fca491e546be8e0a4a53330516 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
@@ -143,13 +143,14 @@ DeviceLocalAccountPolicyServiceTestBase::
void DeviceLocalAccountPolicyServiceTestBase::SetUp() {
chromeos::DeviceSettingsTestBase::SetUp();
- expected_policy_map_.Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY,
+ expected_policy_map_.Set(key::kSearchSuggestEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
base::WrapUnique(new base::FundamentalValue(true)),
nullptr);
- device_local_account_policy_.payload().mutable_disablespdy()->set_value(
- true);
+ device_local_account_policy_.payload()
+ .mutable_searchsuggestenabled()
+ ->set_value(true);
device_local_account_policy_.policy_data().set_policy_type(
dm_protocol::kChromePublicAccountPolicyType);
}
@@ -872,8 +873,9 @@ TEST_F(DeviceLocalAccountPolicyProviderTest, Policy) {
// Policy change should be reported.
EXPECT_CALL(provider_observer_, OnUpdatePolicy(provider_.get()))
.Times(AtLeast(1));
- device_local_account_policy_.payload().mutable_disablespdy()->set_value(
- false);
+ device_local_account_policy_.payload()
+ .mutable_searchsuggestenabled()
+ ->set_value(false);
InstallDeviceLocalAccountPolicy(kAccount1);
DeviceLocalAccountPolicyBroker* broker =
service_->GetBrokerForUser(account_1_user_id_);
@@ -884,8 +886,8 @@ TEST_F(DeviceLocalAccountPolicyProviderTest, Policy) {
expected_policy_bundle
.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
- .Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
+ .Set(key::kSearchSuggestEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
base::WrapUnique(new base::FundamentalValue(false)), nullptr);
EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies()));

Powered by Google App Engine
This is Rietveld 408576698