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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 320063002: NetworkingPrivate API events should supply list of GUIDs, not service paths (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 NetworkPortalDetector::InitializeForTesting(network_portal_detector_); 425 NetworkPortalDetector::InitializeForTesting(network_portal_detector_);
426 426
427 NetworkPortalDetector::CaptivePortalState online_state; 427 NetworkPortalDetector::CaptivePortalState online_state;
428 online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE; 428 online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
429 online_state.response_code = 204; 429 online_state.response_code = 204;
430 // Default detworks happens to be usually "eth1" in tests. 430 // Default detworks happens to be usually "eth1" in tests.
431 network_portal_detector_->SetDefaultNetworkPathForTesting( 431 network_portal_detector_->SetDefaultNetworkPathForTesting(
432 NetworkHandler::Get() 432 NetworkHandler::Get()
433 ->network_state_handler() 433 ->network_state_handler()
434 ->DefaultNetwork() 434 ->DefaultNetwork()
435 ->path()); 435 ->path(),
436 NetworkHandler::Get()
437 ->network_state_handler()
438 ->DefaultNetwork()
439 ->guid());
stevenjb 2014/06/06 21:43:49 nit: Use a local variable for DefaultNetwork
tbarzic 2014/06/06 22:00:41 Done.
436 network_portal_detector_->SetDetectionResultsForTesting( 440 network_portal_detector_->SetDetectionResultsForTesting(
437 NetworkHandler::Get() 441 NetworkHandler::Get()
438 ->network_state_handler() 442 ->network_state_handler()
439 ->DefaultNetwork() 443 ->DefaultNetwork()
440 ->path(), 444 ->path(),
441 online_state); 445 online_state);
442 } 446 }
443 447
444 void OnExit(ScreenObserver::ExitCodes exit_code) { 448 void OnExit(ScreenObserver::ExitCodes exit_code) {
445 WizardController::default_controller()->OnExit(exit_code); 449 WizardController::default_controller()->OnExit(exit_code);
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 1095
1092 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571 1096 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
1093 1097
1094 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when 1098 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
1095 // UI and logic is ready. http://crbug.com/127016 1099 // UI and logic is ready. http://crbug.com/127016
1096 1100
1097 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 21, 1101 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 21,
1098 add_tests_for_new_control_flow_you_just_introduced); 1102 add_tests_for_new_control_flow_you_just_introduced);
1099 1103
1100 } // namespace chromeos 1104 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698