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

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

Issue 10162027: Reimplement CrosProposeScan without Libcros (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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 // Calls mock RequestNetworkScan. 192 // Calls mock RequestNetworkScan.
193 void CallMockRequestNetworkScan(const char* network_type) { 193 void CallMockRequestNetworkScan(const char* network_type) {
194 g_mock_chromeos_network->RequestNetworkScan(network_type); 194 g_mock_chromeos_network->RequestNetworkScan(network_type);
195 } 195 }
196 196
197 // Calls mock RequestNetworkDeviceEnable. 197 // Calls mock RequestNetworkDeviceEnable.
198 void CallMockRequestNetworkDeviceEnable(const char* network_type, bool enable) { 198 void CallMockRequestNetworkDeviceEnable(const char* network_type, bool enable) {
199 g_mock_chromeos_network->RequestNetworkDeviceEnable(network_type, enable); 199 g_mock_chromeos_network->RequestNetworkDeviceEnable(network_type, enable);
200 } 200 }
201 201
202 // Calls mock ProposeScan.
203 void CallMockProposeScan(const char* device_path) {
204 g_mock_chromeos_network->ProposeScan(device_path);
205 }
206
202 // Calls mock AddIPConfig. 207 // Calls mock AddIPConfig.
203 bool CallMockAddIPConfig(const char* device_path, IPConfigType type) { 208 bool CallMockAddIPConfig(const char* device_path, IPConfigType type) {
204 return g_mock_chromeos_network->AddIPConfig(device_path, type); 209 return g_mock_chromeos_network->AddIPConfig(device_path, type);
205 } 210 }
206 211
207 // Calls mock RemoveIPConfig. 212 // Calls mock RemoveIPConfig.
208 bool CallMockRemoveIPConfig(IPConfig* config) { 213 bool CallMockRemoveIPConfig(IPConfig* config) {
209 return g_mock_chromeos_network->RemoveIPConfig(config); 214 return g_mock_chromeos_network->RemoveIPConfig(config);
210 } 215 }
211 216
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 chromeos::RequestHiddenWifiNetworkProperties = 287 chromeos::RequestHiddenWifiNetworkProperties =
283 &CallMockRequestHiddenWifiNetworkProperties; 288 &CallMockRequestHiddenWifiNetworkProperties;
284 chromeos::RequestVirtualNetworkProperties = 289 chromeos::RequestVirtualNetworkProperties =
285 &CallMockRequestVirtualNetworkProperties; 290 &CallMockRequestVirtualNetworkProperties;
286 chromeos::RequestNetworkServiceDisconnect = 291 chromeos::RequestNetworkServiceDisconnect =
287 &CallMockRequestNetworkServiceDisconnect; 292 &CallMockRequestNetworkServiceDisconnect;
288 chromeos::RequestRemoveNetworkService = 293 chromeos::RequestRemoveNetworkService =
289 &CallMockRequestRemoveNetworkService; 294 &CallMockRequestRemoveNetworkService;
290 chromeos::RequestNetworkScan = &CallMockRequestNetworkScan; 295 chromeos::RequestNetworkScan = &CallMockRequestNetworkScan;
291 chromeos::RequestNetworkDeviceEnable = &CallMockRequestNetworkDeviceEnable; 296 chromeos::RequestNetworkDeviceEnable = &CallMockRequestNetworkDeviceEnable;
297 chromeos::ProposeScan = &CallMockProposeScan;
292 chromeos::AddIPConfig = &CallMockAddIPConfig; 298 chromeos::AddIPConfig = &CallMockAddIPConfig;
293 chromeos::RemoveIPConfig = &CallMockRemoveIPConfig; 299 chromeos::RemoveIPConfig = &CallMockRemoveIPConfig;
294 chromeos::GetDeviceNetworkList = &CallMockGetDeviceNetworkList; 300 chromeos::GetDeviceNetworkList = &CallMockGetDeviceNetworkList;
295 chromeos::FreeDeviceNetworkList = &CallMockFreeDeviceNetworkList; 301 chromeos::FreeDeviceNetworkList = &CallMockFreeDeviceNetworkList;
296 chromeos::ConfigureService = &CallMockConfigureService; 302 chromeos::ConfigureService = &CallMockConfigureService;
297 } else { 303 } else {
298 LOG(ERROR) << "CrosLibrary is initialized."; 304 LOG(ERROR) << "CrosLibrary is initialized.";
299 } 305 }
300 } 306 }
301 307
(...skipping 19 matching lines...) Expand all
321 chromeos::RequestNetworkServiceProperties = NULL; 327 chromeos::RequestNetworkServiceProperties = NULL;
322 chromeos::RequestNetworkDeviceProperties = NULL; 328 chromeos::RequestNetworkDeviceProperties = NULL;
323 chromeos::RequestNetworkProfileProperties = NULL; 329 chromeos::RequestNetworkProfileProperties = NULL;
324 chromeos::RequestNetworkProfileEntryProperties = NULL; 330 chromeos::RequestNetworkProfileEntryProperties = NULL;
325 chromeos::RequestHiddenWifiNetworkProperties = NULL; 331 chromeos::RequestHiddenWifiNetworkProperties = NULL;
326 chromeos::RequestVirtualNetworkProperties = NULL; 332 chromeos::RequestVirtualNetworkProperties = NULL;
327 chromeos::RequestNetworkServiceDisconnect = NULL; 333 chromeos::RequestNetworkServiceDisconnect = NULL;
328 chromeos::RequestRemoveNetworkService = NULL; 334 chromeos::RequestRemoveNetworkService = NULL;
329 chromeos::RequestNetworkScan = NULL; 335 chromeos::RequestNetworkScan = NULL;
330 chromeos::RequestNetworkDeviceEnable = NULL; 336 chromeos::RequestNetworkDeviceEnable = NULL;
337 chromeos::ProposeScan = NULL;
331 chromeos::AddIPConfig = NULL; 338 chromeos::AddIPConfig = NULL;
332 chromeos::RemoveIPConfig = NULL; 339 chromeos::RemoveIPConfig = NULL;
333 chromeos::GetDeviceNetworkList = NULL; 340 chromeos::GetDeviceNetworkList = NULL;
334 chromeos::FreeDeviceNetworkList = NULL; 341 chromeos::FreeDeviceNetworkList = NULL;
335 chromeos::ConfigureService = NULL; 342 chromeos::ConfigureService = NULL;
336 } else { 343 } else {
337 LOG(ERROR) << "CrosLibrary is initialized."; 344 LOG(ERROR) << "CrosLibrary is initialized.";
338 } 345 }
339 346
340 delete g_mock_chromeos_network; 347 delete g_mock_chromeos_network;
341 g_mock_chromeos_network = NULL; 348 g_mock_chromeos_network = NULL;
342 } 349 }
343 350
344 // static 351 // static
345 MockChromeOSNetwork* MockChromeOSNetwork::Get() { 352 MockChromeOSNetwork* MockChromeOSNetwork::Get() {
346 return g_mock_chromeos_network; 353 return g_mock_chromeos_network;
347 } 354 }
348 355
349 } // namespace chromeos 356 } // 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