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

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_test_helper.h

Issue 640063008: Revert of Implemented OwnerSettingsService::Set() method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_ 6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 content::TestBrowserThreadBundle thread_bundle_; 179 content::TestBrowserThreadBundle thread_bundle_;
180 180
181 policy::DevicePolicyBuilder device_policy_; 181 policy::DevicePolicyBuilder device_policy_;
182 182
183 DeviceSettingsTestHelper device_settings_test_helper_; 183 DeviceSettingsTestHelper device_settings_test_helper_;
184 // Note that FakeUserManager is used by ProfileHelper, which some of the 184 // Note that FakeUserManager is used by ProfileHelper, which some of the
185 // tested classes depend on implicitly. 185 // tested classes depend on implicitly.
186 FakeUserManager* user_manager_; 186 FakeUserManager* user_manager_;
187 ScopedUserManagerEnabler user_manager_enabler_; 187 ScopedUserManagerEnabler user_manager_enabler_;
188 scoped_ptr<TestingProfile> profile_;
188 scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_; 189 scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;
189 // Local DeviceSettingsService instance for tests. Avoid using in combination 190 // Local DeviceSettingsService instance for tests. Avoid using in combination
190 // with the global instance (DeviceSettingsService::Get()). 191 // with the global instance (DeviceSettingsService::Get()).
191 DeviceSettingsService device_settings_service_; 192 DeviceSettingsService device_settings_service_;
192 scoped_ptr<TestingProfile> profile_;
193 193
194 scoped_ptr<DBusThreadManagerSetter> dbus_setter_; 194 scoped_ptr<DBusThreadManagerSetter> dbus_setter_;
195 195
196 private: 196 private:
197 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase); 197 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);
198 }; 198 };
199 199
200 } // namespace chromeos 200 } // namespace chromeos
201 201
202 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_ 202 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698