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

Side by Side Diff: chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc

Issue 738843002: Call to CrosSettings::Set() is replaced by OwnerSettingsService::Set() in VersionUpdaterCros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. Created 6 years 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 <queue> 5 #include <queue>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/linked_ptr.h" 9 #include "base/memory/linked_ptr.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 user_data_dir_override_(chrome::DIR_USER_DATA) {} 86 user_data_dir_override_(chrome::DIR_USER_DATA) {}
87 87
88 virtual void SetUp() override { 88 virtual void SetUp() override {
89 DeviceSettingsTestBase::SetUp(); 89 DeviceSettingsTestBase::SetUp();
90 provider_.reset(new DeviceSettingsProvider(base::Bind(&OnPrefChanged), 90 provider_.reset(new DeviceSettingsProvider(base::Bind(&OnPrefChanged),
91 &device_settings_service_)); 91 &device_settings_service_));
92 owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey()); 92 owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
93 InitOwner(device_policy_.policy_data().username(), true); 93 InitOwner(device_policy_.policy_data().username(), true);
94 FlushDeviceSettings(); 94 FlushDeviceSettings();
95 95
96 service_ = 96 service_ = OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(
97 OwnerSettingsServiceChromeOSFactory::GetForProfile(profile_.get()); 97 profile_.get());
98 ASSERT_TRUE(service_); 98 ASSERT_TRUE(service_);
99 ASSERT_TRUE(service_->IsOwner()); 99 ASSERT_TRUE(service_->IsOwner());
100 } 100 }
101 101
102 virtual void TearDown() override { DeviceSettingsTestBase::TearDown(); } 102 virtual void TearDown() override { DeviceSettingsTestBase::TearDown(); }
103 103
104 void TestSingleSet(OwnerSettingsServiceChromeOS* service, 104 void TestSingleSet(OwnerSettingsServiceChromeOS* service,
105 const std::string& setting, 105 const std::string& setting,
106 const base::Value& in_value) { 106 const base::Value& in_value) {
107 PrefsChecker checker(service, provider_.get()); 107 PrefsChecker checker(service, provider_.get());
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 : public OwnerSettingsServiceChromeOSTest { 162 : public OwnerSettingsServiceChromeOSTest {
163 public: 163 public:
164 OwnerSettingsServiceChromeOSNoOwnerTest() {} 164 OwnerSettingsServiceChromeOSNoOwnerTest() {}
165 virtual ~OwnerSettingsServiceChromeOSNoOwnerTest() {} 165 virtual ~OwnerSettingsServiceChromeOSNoOwnerTest() {}
166 166
167 virtual void SetUp() override { 167 virtual void SetUp() override {
168 DeviceSettingsTestBase::SetUp(); 168 DeviceSettingsTestBase::SetUp();
169 provider_.reset(new DeviceSettingsProvider(base::Bind(&OnPrefChanged), 169 provider_.reset(new DeviceSettingsProvider(base::Bind(&OnPrefChanged),
170 &device_settings_service_)); 170 &device_settings_service_));
171 FlushDeviceSettings(); 171 FlushDeviceSettings();
172 service_ = 172 service_ = OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(
173 OwnerSettingsServiceChromeOSFactory::GetForProfile(profile_.get()); 173 profile_.get());
174 ASSERT_TRUE(service_); 174 ASSERT_TRUE(service_);
175 ASSERT_FALSE(service_->IsOwner()); 175 ASSERT_FALSE(service_->IsOwner());
176 } 176 }
177 177
178 virtual void TearDown() override { DeviceSettingsTestBase::TearDown(); } 178 virtual void TearDown() override { DeviceSettingsTestBase::TearDown(); }
179 179
180 private: 180 private:
181 DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOSNoOwnerTest); 181 DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOSNoOwnerTest);
182 }; 182 };
183 183
184 TEST_F(OwnerSettingsServiceChromeOSNoOwnerTest, SingleSetTest) { 184 TEST_F(OwnerSettingsServiceChromeOSNoOwnerTest, SingleSetTest) {
185 ASSERT_FALSE(service_->SetBoolean(kAccountsPrefAllowGuest, false)); 185 ASSERT_FALSE(service_->SetBoolean(kAccountsPrefAllowGuest, false));
186 } 186 }
187 187
188 } // namespace chromeos 188 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698