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

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

Powered by Google App Engine
This is Rietveld 408576698