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

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

Issue 10134028: Reimplement ActivateCellularModem without Libcros (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
11 namespace { 11 namespace {
12 12
13 MockChromeOSNetwork* g_mock_chromeos_network = NULL; 13 MockChromeOSNetwork* g_mock_chromeos_network = NULL;
14 14
15 // Calls mock ActivateCellularModem.
16 bool CallMockActivateCellularModem(const char* service_path,
17 const char* carrier) {
18 return g_mock_chromeos_network->ActivateCellularModem(service_path, carrier);
19 }
20
15 // Calls mock SetNetworkServicePropertyGValue. 21 // Calls mock SetNetworkServicePropertyGValue.
16 void CallMockSetNetworkServicePropertyGValue(const char* service_path, 22 void CallMockSetNetworkServicePropertyGValue(const char* service_path,
17 const char* property, 23 const char* property,
18 const GValue* gvalue) { 24 const GValue* gvalue) {
19 g_mock_chromeos_network->SetNetworkServicePropertyGValue(service_path, 25 g_mock_chromeos_network->SetNetworkServicePropertyGValue(service_path,
20 property, gvalue); 26 property, gvalue);
21 } 27 }
22 28
23 // Calls mock ClearNetworkServiceProperty. 29 // Calls mock ClearNetworkServiceProperty.
24 void CallMockClearNetworkServiceProperty(const char* service_path, 30 void CallMockClearNetworkServiceProperty(const char* service_path,
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 236
231 // static 237 // static
232 void MockChromeOSNetwork::Initialize() { 238 void MockChromeOSNetwork::Initialize() {
233 if (g_mock_chromeos_network) { 239 if (g_mock_chromeos_network) {
234 LOG(WARNING) << "MockChromeOSNetwork is already initialized."; 240 LOG(WARNING) << "MockChromeOSNetwork is already initialized.";
235 return; 241 return;
236 } 242 }
237 g_mock_chromeos_network = new MockChromeOSNetwork; 243 g_mock_chromeos_network = new MockChromeOSNetwork;
238 244
239 if (!CrosLibrary::Get()) { 245 if (!CrosLibrary::Get()) {
246 chromeos::ActivateCellularModem = &CallMockActivateCellularModem;
240 chromeos::SetNetworkServicePropertyGValue = 247 chromeos::SetNetworkServicePropertyGValue =
241 &CallMockSetNetworkServicePropertyGValue; 248 &CallMockSetNetworkServicePropertyGValue;
242 chromeos::ClearNetworkServiceProperty = 249 chromeos::ClearNetworkServiceProperty =
243 &CallMockClearNetworkServiceProperty; 250 &CallMockClearNetworkServiceProperty;
244 chromeos::SetNetworkDevicePropertyGValue = 251 chromeos::SetNetworkDevicePropertyGValue =
245 &CallMockSetNetworkDevicePropertyGValue; 252 &CallMockSetNetworkDevicePropertyGValue;
246 chromeos::SetNetworkIPConfigPropertyGValue = 253 chromeos::SetNetworkIPConfigPropertyGValue =
247 &CallMockSetNetworkIPConfigPropertyGValue; 254 &CallMockSetNetworkIPConfigPropertyGValue;
248 chromeos::SetNetworkManagerPropertyGValue = 255 chromeos::SetNetworkManagerPropertyGValue =
249 &CallMockSetNetworkManagerPropertyGValue; 256 &CallMockSetNetworkManagerPropertyGValue;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 chromeos::FreeDeviceNetworkList = &CallMockFreeDeviceNetworkList; 295 chromeos::FreeDeviceNetworkList = &CallMockFreeDeviceNetworkList;
289 chromeos::ConfigureService = &CallMockConfigureService; 296 chromeos::ConfigureService = &CallMockConfigureService;
290 } else { 297 } else {
291 LOG(ERROR) << "CrosLibrary is initialized."; 298 LOG(ERROR) << "CrosLibrary is initialized.";
292 } 299 }
293 } 300 }
294 301
295 // static 302 // static
296 void MockChromeOSNetwork::Shutdown() { 303 void MockChromeOSNetwork::Shutdown() {
297 if (!CrosLibrary::Get()) { 304 if (!CrosLibrary::Get()) {
305 chromeos::ActivateCellularModem = NULL;
298 chromeos::SetNetworkServicePropertyGValue = NULL; 306 chromeos::SetNetworkServicePropertyGValue = NULL;
299 chromeos::ClearNetworkServiceProperty = NULL; 307 chromeos::ClearNetworkServiceProperty = NULL;
300 chromeos::SetNetworkDevicePropertyGValue = NULL; 308 chromeos::SetNetworkDevicePropertyGValue = NULL;
301 chromeos::SetNetworkIPConfigPropertyGValue = NULL; 309 chromeos::SetNetworkIPConfigPropertyGValue = NULL;
302 chromeos::SetNetworkManagerPropertyGValue = NULL; 310 chromeos::SetNetworkManagerPropertyGValue = NULL;
303 chromeos::MonitorNetworkManagerProperties = NULL; 311 chromeos::MonitorNetworkManagerProperties = NULL;
304 chromeos::MonitorNetworkServiceProperties = NULL; 312 chromeos::MonitorNetworkServiceProperties = NULL;
305 chromeos::MonitorNetworkDeviceProperties = NULL; 313 chromeos::MonitorNetworkDeviceProperties = NULL;
306 chromeos::DisconnectNetworkPropertiesMonitor = NULL; 314 chromeos::DisconnectNetworkPropertiesMonitor = NULL;
307 chromeos::MonitorCellularDataPlan = NULL; 315 chromeos::MonitorCellularDataPlan = NULL;
(...skipping 24 matching lines...) Expand all
332 delete g_mock_chromeos_network; 340 delete g_mock_chromeos_network;
333 g_mock_chromeos_network = NULL; 341 g_mock_chromeos_network = NULL;
334 } 342 }
335 343
336 // static 344 // static
337 MockChromeOSNetwork* MockChromeOSNetwork::Get() { 345 MockChromeOSNetwork* MockChromeOSNetwork::Get() {
338 return g_mock_chromeos_network; 346 return g_mock_chromeos_network;
339 } 347 }
340 348
341 } // namespace chromeos 349 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698