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

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

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 return entry == device_local_account_policy_.end() ? 75 return entry == device_local_account_policy_.end() ?
76 base::EmptyString() : entry->second.policy_blob_; 76 base::EmptyString() : entry->second.policy_blob_;
77 } 77 }
78 78
79 void set_device_local_account_policy_blob(const std::string& id, 79 void set_device_local_account_policy_blob(const std::string& id,
80 const std::string& policy_blob) { 80 const std::string& policy_blob) {
81 device_local_account_policy_[id].policy_blob_ = policy_blob; 81 device_local_account_policy_[id].policy_blob_ = policy_blob;
82 } 82 }
83 83
84 // SessionManagerClient: 84 // SessionManagerClient:
85 virtual void Init(dbus::Bus* bus) OVERRIDE; 85 virtual void Init(dbus::Bus* bus) override;
86 virtual void SetStubDelegate(SessionManagerClient::StubDelegate* delegate) 86 virtual void SetStubDelegate(SessionManagerClient::StubDelegate* delegate)
87 OVERRIDE; 87 override;
88 virtual void AddObserver(Observer* observer) OVERRIDE; 88 virtual void AddObserver(Observer* observer) override;
89 virtual void RemoveObserver(Observer* observer) OVERRIDE; 89 virtual void RemoveObserver(Observer* observer) override;
90 virtual bool HasObserver(Observer* observer) OVERRIDE; 90 virtual bool HasObserver(Observer* observer) override;
91 virtual void EmitLoginPromptVisible() OVERRIDE; 91 virtual void EmitLoginPromptVisible() override;
92 virtual void RestartJob(int pid, const std::string& command_line) OVERRIDE; 92 virtual void RestartJob(int pid, const std::string& command_line) override;
93 virtual void StartSession(const std::string& user_email) OVERRIDE; 93 virtual void StartSession(const std::string& user_email) override;
94 virtual void StopSession() OVERRIDE; 94 virtual void StopSession() override;
95 virtual void StartDeviceWipe() OVERRIDE; 95 virtual void StartDeviceWipe() override;
96 virtual void RequestLockScreen() OVERRIDE; 96 virtual void RequestLockScreen() override;
97 virtual void NotifyLockScreenShown() OVERRIDE; 97 virtual void NotifyLockScreenShown() override;
98 virtual void NotifyLockScreenDismissed() OVERRIDE; 98 virtual void NotifyLockScreenDismissed() override;
99 virtual void RetrieveActiveSessions( 99 virtual void RetrieveActiveSessions(
100 const ActiveSessionsCallback& callback) OVERRIDE; 100 const ActiveSessionsCallback& callback) override;
101 virtual void RetrieveDevicePolicy( 101 virtual void RetrieveDevicePolicy(
102 const RetrievePolicyCallback& callback) OVERRIDE; 102 const RetrievePolicyCallback& callback) override;
103 virtual void RetrievePolicyForUser( 103 virtual void RetrievePolicyForUser(
104 const std::string& username, 104 const std::string& username,
105 const RetrievePolicyCallback& callback) OVERRIDE; 105 const RetrievePolicyCallback& callback) override;
106 virtual std::string BlockingRetrievePolicyForUser( 106 virtual std::string BlockingRetrievePolicyForUser(
107 const std::string& username) OVERRIDE; 107 const std::string& username) override;
108 virtual void RetrieveDeviceLocalAccountPolicy( 108 virtual void RetrieveDeviceLocalAccountPolicy(
109 const std::string& account_id, 109 const std::string& account_id,
110 const RetrievePolicyCallback& callback) OVERRIDE; 110 const RetrievePolicyCallback& callback) override;
111 virtual void StoreDevicePolicy(const std::string& policy_blob, 111 virtual void StoreDevicePolicy(const std::string& policy_blob,
112 const StorePolicyCallback& callback) OVERRIDE; 112 const StorePolicyCallback& callback) override;
113 virtual void StorePolicyForUser(const std::string& username, 113 virtual void StorePolicyForUser(const std::string& username,
114 const std::string& policy_blob, 114 const std::string& policy_blob,
115 const StorePolicyCallback& callback) OVERRIDE; 115 const StorePolicyCallback& callback) override;
116 virtual void StoreDeviceLocalAccountPolicy( 116 virtual void StoreDeviceLocalAccountPolicy(
117 const std::string& account_id, 117 const std::string& account_id,
118 const std::string& policy_blob, 118 const std::string& policy_blob,
119 const StorePolicyCallback& callback) OVERRIDE; 119 const StorePolicyCallback& callback) override;
120 virtual void SetFlagsForUser( 120 virtual void SetFlagsForUser(
121 const std::string& account_id, 121 const std::string& account_id,
122 const std::vector<std::string>& flags) OVERRIDE; 122 const std::vector<std::string>& flags) override;
123 virtual void GetServerBackedStateKeys( 123 virtual void GetServerBackedStateKeys(
124 const StateKeysCallback& callback) OVERRIDE; 124 const StateKeysCallback& callback) override;
125 125
126 private: 126 private:
127 struct PolicyState { 127 struct PolicyState {
128 bool store_result_; 128 bool store_result_;
129 std::string policy_blob_; 129 std::string policy_blob_;
130 std::vector<StorePolicyCallback> store_callbacks_; 130 std::vector<StorePolicyCallback> store_callbacks_;
131 std::vector<RetrievePolicyCallback> retrieve_callbacks_; 131 std::vector<RetrievePolicyCallback> retrieve_callbacks_;
132 132
133 PolicyState(); 133 PolicyState();
134 ~PolicyState(); 134 ~PolicyState();
(...skipping 22 matching lines...) Expand all
157 157
158 // A convenience test base class that initializes a DeviceSettingsService 158 // A convenience test base class that initializes a DeviceSettingsService
159 // instance for testing and allows for straightforward updating of device 159 // instance for testing and allows for straightforward updating of device
160 // settings. |device_settings_service_| starts out in uninitialized state, so 160 // settings. |device_settings_service_| starts out in uninitialized state, so
161 // startup code gets tested as well. 161 // startup code gets tested as well.
162 class DeviceSettingsTestBase : public testing::Test { 162 class DeviceSettingsTestBase : public testing::Test {
163 protected: 163 protected:
164 DeviceSettingsTestBase(); 164 DeviceSettingsTestBase();
165 virtual ~DeviceSettingsTestBase(); 165 virtual ~DeviceSettingsTestBase();
166 166
167 virtual void SetUp() OVERRIDE; 167 virtual void SetUp() override;
168 virtual void TearDown() OVERRIDE; 168 virtual void TearDown() override;
169 169
170 // Flushes any pending device settings operations. 170 // Flushes any pending device settings operations.
171 void FlushDeviceSettings(); 171 void FlushDeviceSettings();
172 172
173 // Triggers an owner key and device settings reload on 173 // Triggers an owner key and device settings reload on
174 // |device_settings_service_| and flushes the resulting load operation. 174 // |device_settings_service_| and flushes the resulting load operation.
175 void ReloadDeviceSettings(); 175 void ReloadDeviceSettings();
176 176
177 void InitOwner(const std::string& user_id, bool tpm_is_ready); 177 void InitOwner(const std::string& user_id, bool tpm_is_ready);
178 178
(...skipping 14 matching lines...) Expand all
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