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

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

Issue 23694025: Remove calls to deprecated session_manager DBus methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix use-after-free in tests. Created 7 years, 3 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 | Annotate | Revision Log
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 "chrome/browser/chromeos/settings/device_settings_test_helper.h" 5 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/threading/sequenced_worker_pool.h" 9 #include "base/threading/sequenced_worker_pool.h"
10 #include "chrome/browser/chromeos/settings/device_settings_service.h" 10 #include "chrome/browser/chromeos/settings/device_settings_service.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 return false; 106 return false;
107 } 107 }
108 108
109 void DeviceSettingsTestHelper::EmitLoginPromptReady() {} 109 void DeviceSettingsTestHelper::EmitLoginPromptReady() {}
110 110
111 void DeviceSettingsTestHelper::EmitLoginPromptVisible() {} 111 void DeviceSettingsTestHelper::EmitLoginPromptVisible() {}
112 112
113 void DeviceSettingsTestHelper::RestartJob(int pid, 113 void DeviceSettingsTestHelper::RestartJob(int pid,
114 const std::string& command_line) {} 114 const std::string& command_line) {}
115 115
116 void DeviceSettingsTestHelper::RestartEntd() {}
117
118 void DeviceSettingsTestHelper::StartSession(const std::string& user_email) {} 116 void DeviceSettingsTestHelper::StartSession(const std::string& user_email) {}
119 117
120 void DeviceSettingsTestHelper::StopSession() {} 118 void DeviceSettingsTestHelper::StopSession() {}
121 119
122 void DeviceSettingsTestHelper::StartDeviceWipe() {} 120 void DeviceSettingsTestHelper::StartDeviceWipe() {}
123 121
124 void DeviceSettingsTestHelper::RequestLockScreen() {} 122 void DeviceSettingsTestHelper::RequestLockScreen() {}
125 123
126 void DeviceSettingsTestHelper::NotifyLockScreenShown() {} 124 void DeviceSettingsTestHelper::NotifyLockScreenShown() {}
127 125
128 void DeviceSettingsTestHelper::RequestUnlockScreen() {}
129
130 void DeviceSettingsTestHelper::NotifyLockScreenDismissed() {} 126 void DeviceSettingsTestHelper::NotifyLockScreenDismissed() {}
131 127
132 void DeviceSettingsTestHelper::RetrieveActiveSessions( 128 void DeviceSettingsTestHelper::RetrieveActiveSessions(
133 const ActiveSessionsCallback& callback) {} 129 const ActiveSessionsCallback& callback) {}
134 130
135 void DeviceSettingsTestHelper::RetrieveDevicePolicy( 131 void DeviceSettingsTestHelper::RetrieveDevicePolicy(
136 const RetrievePolicyCallback& callback) { 132 const RetrievePolicyCallback& callback) {
137 device_policy_.retrieve_callbacks_.push_back(callback); 133 device_policy_.retrieve_callbacks_.push_back(callback);
138 } 134 }
139 135
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 void DeviceSettingsTestBase::FlushDeviceSettings() { 229 void DeviceSettingsTestBase::FlushDeviceSettings() {
234 device_settings_test_helper_.Flush(); 230 device_settings_test_helper_.Flush();
235 } 231 }
236 232
237 void DeviceSettingsTestBase::ReloadDeviceSettings() { 233 void DeviceSettingsTestBase::ReloadDeviceSettings() {
238 device_settings_service_.OwnerKeySet(true); 234 device_settings_service_.OwnerKeySet(true);
239 FlushDeviceSettings(); 235 FlushDeviceSettings();
240 } 236 }
241 237
242 } // namespace chromeos 238 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698