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

Side by Side Diff: chrome/browser/chromeos/cros/mock_chromeos_network.cc

Issue 10134027: Reimplement RequestNetworkServiceConnect, RequestRequirePin, RequestEnterPin, RequestEnterPin, Requ… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove reinterpret_cast Created 8 years, 8 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/cros/mock_chromeos_network.h" 5 #include "chrome/browser/chromeos/cros/mock_chromeos_network.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "chrome/browser/chromeos/cros/cros_library.h" 7 #include "chrome/browser/chromeos/cros/cros_library.h"
8 8
9 namespace chromeos { 9 namespace chromeos {
10 10
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 void* object) { 101 void* object) {
102 return g_mock_chromeos_network->MonitorSMS(modem_device_path, callback, 102 return g_mock_chromeos_network->MonitorSMS(modem_device_path, callback,
103 object); 103 object);
104 } 104 }
105 105
106 // Calls mock DisconnectSMSMonitor. 106 // Calls mock DisconnectSMSMonitor.
107 void CallMockDisconnectSMSMonitor(SMSMonitor monitor) { 107 void CallMockDisconnectSMSMonitor(SMSMonitor monitor) {
108 g_mock_chromeos_network->DisconnectSMSMonitor(monitor); 108 g_mock_chromeos_network->DisconnectSMSMonitor(monitor);
109 } 109 }
110 110
111 // Calls mock RequestNetworkServiceConnect.
112 void CallMockRequestNetworkServiceConnect(const char* service_path,
113 NetworkActionCallback callback,
114 void* object) {
115 g_mock_chromeos_network->RequestNetworkServiceConnect(
116 service_path, callback, object);
117 }
118
111 // Calls mock RequestNetworkManagerProperties. 119 // Calls mock RequestNetworkManagerProperties.
112 void CallMockRequestNetworkManagerProperties( 120 void CallMockRequestNetworkManagerProperties(
113 NetworkPropertiesGValueCallback callback, 121 NetworkPropertiesGValueCallback callback,
114 void* object) { 122 void* object) {
115 g_mock_chromeos_network->RequestNetworkManagerProperties(callback, object); 123 g_mock_chromeos_network->RequestNetworkManagerProperties(callback, object);
116 } 124 }
117 125
118 // Calls mock RequestNetworkServiceProperties. 126 // Calls mock RequestNetworkServiceProperties.
119 void CallMockRequestNetworkServiceProperties( 127 void CallMockRequestNetworkServiceProperties(
120 const char* service_path, 128 const char* service_path,
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 // Calls mock RequestNetworkScan. 194 // Calls mock RequestNetworkScan.
187 void CallMockRequestNetworkScan(const char* network_type) { 195 void CallMockRequestNetworkScan(const char* network_type) {
188 g_mock_chromeos_network->RequestNetworkScan(network_type); 196 g_mock_chromeos_network->RequestNetworkScan(network_type);
189 } 197 }
190 198
191 // Calls mock RequestNetworkDeviceEnable. 199 // Calls mock RequestNetworkDeviceEnable.
192 void CallMockRequestNetworkDeviceEnable(const char* network_type, bool enable) { 200 void CallMockRequestNetworkDeviceEnable(const char* network_type, bool enable) {
193 g_mock_chromeos_network->RequestNetworkDeviceEnable(network_type, enable); 201 g_mock_chromeos_network->RequestNetworkDeviceEnable(network_type, enable);
194 } 202 }
195 203
204 // Calls mock RequestRequirePin.
205 void CallMockRequestRequirePin(const char* device_path,
206 const char* pin,
207 bool enable,
208 NetworkActionCallback callback,
209 void* object) {
210 g_mock_chromeos_network->RequestRequirePin(device_path, pin, enable, callback,
211 object);
212 }
213
214 // Calls mock RequestEnterPin.
215 void CallMockRequestEnterPin(const char* device_path,
216 const char* pin,
217 NetworkActionCallback callback,
218 void* object) {
219 g_mock_chromeos_network->RequestEnterPin(device_path, pin, callback, object);
220 }
221
222 // Calls mock RequestUnblockPin.
223 void CallMockRequestUnblockPin(const char* device_path,
224 const char* unblock_code,
225 const char* pin,
226 NetworkActionCallback callback,
227 void* object) {
228 g_mock_chromeos_network->RequestUnblockPin(device_path, unblock_code, pin,
229 callback, object);
230 }
231
232 // Calls mock RequestChangePin.
233 void CallMockRequestChangePin(const char* device_path,
234 const char* old_pin,
235 const char* new_pin,
236 NetworkActionCallback callback,
237 void* object) {
238 g_mock_chromeos_network->RequestChangePin(device_path, old_pin, new_pin,
239 callback, object);
240 }
241
242 // Calls mock RequestCellularRegister.
243 void CallMockRequestCellularRegister(const char* device_path,
244 const char* network_id,
245 NetworkActionCallback callback,
246 void* object) {
247 g_mock_chromeos_network->RequestCellularRegister(device_path, network_id,
248 callback, object);
249 }
250
196 // Calls mock AddIPConfig. 251 // Calls mock AddIPConfig.
197 bool CallMockAddIPConfig(const char* device_path, IPConfigType type) { 252 bool CallMockAddIPConfig(const char* device_path, IPConfigType type) {
198 return g_mock_chromeos_network->AddIPConfig(device_path, type); 253 return g_mock_chromeos_network->AddIPConfig(device_path, type);
199 } 254 }
200 255
201 // Calls mock RemoveIPConfig. 256 // Calls mock RemoveIPConfig.
202 bool CallMockRemoveIPConfig(IPConfig* config) { 257 bool CallMockRemoveIPConfig(IPConfig* config) {
203 return g_mock_chromeos_network->RemoveIPConfig(config); 258 return g_mock_chromeos_network->RemoveIPConfig(config);
204 } 259 }
205 260
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 &CallMockMonitorNetworkServiceProperties; 310 &CallMockMonitorNetworkServiceProperties;
256 chromeos::MonitorNetworkDeviceProperties = 311 chromeos::MonitorNetworkDeviceProperties =
257 &CallMockMonitorNetworkDeviceProperties; 312 &CallMockMonitorNetworkDeviceProperties;
258 chromeos::DisconnectNetworkPropertiesMonitor = 313 chromeos::DisconnectNetworkPropertiesMonitor =
259 &CallMockDisconnectNetworkPropertiesMonitor; 314 &CallMockDisconnectNetworkPropertiesMonitor;
260 chromeos::MonitorCellularDataPlan = &CallMockMonitorCellularDataPlan; 315 chromeos::MonitorCellularDataPlan = &CallMockMonitorCellularDataPlan;
261 chromeos::DisconnectDataPlanUpdateMonitor = 316 chromeos::DisconnectDataPlanUpdateMonitor =
262 &CallMockDisconnectDataPlanUpdateMonitor; 317 &CallMockDisconnectDataPlanUpdateMonitor;
263 chromeos::MonitorSMS = &CallMockMonitorSMS; 318 chromeos::MonitorSMS = &CallMockMonitorSMS;
264 chromeos::DisconnectSMSMonitor = &CallMockDisconnectSMSMonitor; 319 chromeos::DisconnectSMSMonitor = &CallMockDisconnectSMSMonitor;
320 chromeos::RequestNetworkServiceConnect =
321 &CallMockRequestNetworkServiceConnect;
265 chromeos::RequestNetworkManagerProperties = 322 chromeos::RequestNetworkManagerProperties =
266 &CallMockRequestNetworkManagerProperties; 323 &CallMockRequestNetworkManagerProperties;
267 chromeos::RequestNetworkServiceProperties = 324 chromeos::RequestNetworkServiceProperties =
268 &CallMockRequestNetworkServiceProperties; 325 &CallMockRequestNetworkServiceProperties;
269 chromeos::RequestNetworkDeviceProperties = 326 chromeos::RequestNetworkDeviceProperties =
270 &CallMockRequestNetworkDeviceProperties; 327 &CallMockRequestNetworkDeviceProperties;
271 chromeos::RequestNetworkProfileProperties = 328 chromeos::RequestNetworkProfileProperties =
272 &CallMockRequestNetworkProfileProperties; 329 &CallMockRequestNetworkProfileProperties;
273 chromeos::RequestNetworkProfileEntryProperties = 330 chromeos::RequestNetworkProfileEntryProperties =
274 &CallMockRequestNetworkProfileEntryProperties; 331 &CallMockRequestNetworkProfileEntryProperties;
275 chromeos::RequestHiddenWifiNetworkProperties = 332 chromeos::RequestHiddenWifiNetworkProperties =
276 &CallMockRequestHiddenWifiNetworkProperties; 333 &CallMockRequestHiddenWifiNetworkProperties;
277 chromeos::RequestVirtualNetworkProperties = 334 chromeos::RequestVirtualNetworkProperties =
278 &CallMockRequestVirtualNetworkProperties; 335 &CallMockRequestVirtualNetworkProperties;
279 chromeos::RequestNetworkServiceDisconnect = 336 chromeos::RequestNetworkServiceDisconnect =
280 &CallMockRequestNetworkServiceDisconnect; 337 &CallMockRequestNetworkServiceDisconnect;
281 chromeos::RequestRemoveNetworkService = 338 chromeos::RequestRemoveNetworkService =
282 &CallMockRequestRemoveNetworkService; 339 &CallMockRequestRemoveNetworkService;
283 chromeos::RequestNetworkScan = &CallMockRequestNetworkScan; 340 chromeos::RequestNetworkScan = &CallMockRequestNetworkScan;
284 chromeos::RequestNetworkDeviceEnable = &CallMockRequestNetworkDeviceEnable; 341 chromeos::RequestNetworkDeviceEnable = &CallMockRequestNetworkDeviceEnable;
342 chromeos::RequestRequirePin = &CallMockRequestRequirePin;
343 chromeos::RequestEnterPin = &CallMockRequestEnterPin;
344 chromeos::RequestUnblockPin = &CallMockRequestUnblockPin;
345 chromeos::RequestChangePin = &CallMockRequestChangePin;
346 chromeos::RequestCellularRegister = &CallMockRequestCellularRegister;
285 chromeos::AddIPConfig = &CallMockAddIPConfig; 347 chromeos::AddIPConfig = &CallMockAddIPConfig;
286 chromeos::RemoveIPConfig = &CallMockRemoveIPConfig; 348 chromeos::RemoveIPConfig = &CallMockRemoveIPConfig;
287 chromeos::GetDeviceNetworkList = &CallMockGetDeviceNetworkList; 349 chromeos::GetDeviceNetworkList = &CallMockGetDeviceNetworkList;
288 chromeos::FreeDeviceNetworkList = &CallMockFreeDeviceNetworkList; 350 chromeos::FreeDeviceNetworkList = &CallMockFreeDeviceNetworkList;
289 chromeos::ConfigureService = &CallMockConfigureService; 351 chromeos::ConfigureService = &CallMockConfigureService;
290 } else { 352 } else {
291 LOG(ERROR) << "CrosLibrary is initialized."; 353 LOG(ERROR) << "CrosLibrary is initialized.";
292 } 354 }
293 } 355 }
294 356
295 // static 357 // static
296 void MockChromeOSNetwork::Shutdown() { 358 void MockChromeOSNetwork::Shutdown() {
297 if (!CrosLibrary::Get()) { 359 if (!CrosLibrary::Get()) {
298 chromeos::SetNetworkServicePropertyGValue = NULL; 360 chromeos::SetNetworkServicePropertyGValue = NULL;
299 chromeos::ClearNetworkServiceProperty = NULL; 361 chromeos::ClearNetworkServiceProperty = NULL;
300 chromeos::SetNetworkDevicePropertyGValue = NULL; 362 chromeos::SetNetworkDevicePropertyGValue = NULL;
301 chromeos::SetNetworkIPConfigPropertyGValue = NULL; 363 chromeos::SetNetworkIPConfigPropertyGValue = NULL;
302 chromeos::SetNetworkManagerPropertyGValue = NULL; 364 chromeos::SetNetworkManagerPropertyGValue = NULL;
303 chromeos::MonitorNetworkManagerProperties = NULL; 365 chromeos::MonitorNetworkManagerProperties = NULL;
304 chromeos::MonitorNetworkServiceProperties = NULL; 366 chromeos::MonitorNetworkServiceProperties = NULL;
305 chromeos::MonitorNetworkDeviceProperties = NULL; 367 chromeos::MonitorNetworkDeviceProperties = NULL;
306 chromeos::DisconnectNetworkPropertiesMonitor = NULL; 368 chromeos::DisconnectNetworkPropertiesMonitor = NULL;
307 chromeos::MonitorCellularDataPlan = NULL; 369 chromeos::MonitorCellularDataPlan = NULL;
308 chromeos::DisconnectDataPlanUpdateMonitor = NULL; 370 chromeos::DisconnectDataPlanUpdateMonitor = NULL;
309 chromeos::MonitorSMS = NULL; 371 chromeos::MonitorSMS = NULL;
310 chromeos::DisconnectSMSMonitor = NULL; 372 chromeos::DisconnectSMSMonitor = NULL;
373 chromeos::RequestNetworkServiceConnect = NULL;
311 chromeos::RequestCellularDataPlanUpdate = NULL; 374 chromeos::RequestCellularDataPlanUpdate = NULL;
312 chromeos::RequestNetworkManagerProperties = NULL; 375 chromeos::RequestNetworkManagerProperties = NULL;
313 chromeos::RequestNetworkServiceProperties = NULL; 376 chromeos::RequestNetworkServiceProperties = NULL;
314 chromeos::RequestNetworkDeviceProperties = NULL; 377 chromeos::RequestNetworkDeviceProperties = NULL;
315 chromeos::RequestNetworkProfileProperties = NULL; 378 chromeos::RequestNetworkProfileProperties = NULL;
316 chromeos::RequestNetworkProfileEntryProperties = NULL; 379 chromeos::RequestNetworkProfileEntryProperties = NULL;
317 chromeos::RequestHiddenWifiNetworkProperties = NULL; 380 chromeos::RequestHiddenWifiNetworkProperties = NULL;
318 chromeos::RequestVirtualNetworkProperties = NULL; 381 chromeos::RequestVirtualNetworkProperties = NULL;
319 chromeos::RequestNetworkServiceDisconnect = NULL; 382 chromeos::RequestNetworkServiceDisconnect = NULL;
320 chromeos::RequestRemoveNetworkService = NULL; 383 chromeos::RequestRemoveNetworkService = NULL;
321 chromeos::RequestNetworkScan = NULL; 384 chromeos::RequestNetworkScan = NULL;
322 chromeos::RequestNetworkDeviceEnable = NULL; 385 chromeos::RequestNetworkDeviceEnable = NULL;
386 chromeos::RequestRequirePin = NULL;
387 chromeos::RequestEnterPin = NULL;
388 chromeos::RequestUnblockPin = NULL;
389 chromeos::RequestChangePin = NULL;
390 chromeos::RequestCellularRegister = NULL;
323 chromeos::AddIPConfig = NULL; 391 chromeos::AddIPConfig = NULL;
324 chromeos::RemoveIPConfig = NULL; 392 chromeos::RemoveIPConfig = NULL;
325 chromeos::GetDeviceNetworkList = NULL; 393 chromeos::GetDeviceNetworkList = NULL;
326 chromeos::FreeDeviceNetworkList = NULL; 394 chromeos::FreeDeviceNetworkList = NULL;
327 chromeos::ConfigureService = NULL; 395 chromeos::ConfigureService = NULL;
328 } else { 396 } else {
329 LOG(ERROR) << "CrosLibrary is initialized."; 397 LOG(ERROR) << "CrosLibrary is initialized.";
330 } 398 }
331 399
332 delete g_mock_chromeos_network; 400 delete g_mock_chromeos_network;
333 g_mock_chromeos_network = NULL; 401 g_mock_chromeos_network = NULL;
334 } 402 }
335 403
336 // static 404 // static
337 MockChromeOSNetwork* MockChromeOSNetwork::Get() { 405 MockChromeOSNetwork* MockChromeOSNetwork::Get() {
338 return g_mock_chromeos_network; 406 return g_mock_chromeos_network;
339 } 407 }
340 408
341 } // namespace chromeos 409 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698