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

Side by Side Diff: chrome/browser/chromeos/login/managed/managed_user_test_base.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/login/managed/managed_user_test_base.h" 5 #include "chrome/browser/chromeos/login/managed/managed_user_test_base.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 188
189 // Setup network portal detector to return online state for both 189 // Setup network portal detector to return online state for both
190 // ethernet and wifi networks. Ethernet is an active network by 190 // ethernet and wifi networks. Ethernet is an active network by
191 // default. 191 // default.
192 network_portal_detector_ = new NetworkPortalDetectorTestImpl(); 192 network_portal_detector_ = new NetworkPortalDetectorTestImpl();
193 NetworkPortalDetector::InitializeForTesting(network_portal_detector_); 193 NetworkPortalDetector::InitializeForTesting(network_portal_detector_);
194 NetworkPortalDetector::CaptivePortalState online_state; 194 NetworkPortalDetector::CaptivePortalState online_state;
195 online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE; 195 online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
196 online_state.response_code = 204; 196 online_state.response_code = 204;
197 network_portal_detector_->SetDefaultNetworkPathForTesting( 197 network_portal_detector_->SetDefaultNetworkPathForTesting(
198 kStubEthernetServicePath,
198 kStubEthernetServicePath); 199 kStubEthernetServicePath);
199 network_portal_detector_->SetDetectionResultsForTesting( 200 network_portal_detector_->SetDetectionResultsForTesting(
200 kStubEthernetServicePath, online_state); 201 kStubEthernetServicePath, online_state);
201 } 202 }
202 203
203 void ManagedUserTestBase::CleanUpOnMainThread() { 204 void ManagedUserTestBase::CleanUpOnMainThread() {
204 LoginManagerTest::CleanUpOnMainThread(); 205 LoginManagerTest::CleanUpOnMainThread();
205 } 206 }
206 207
207 void ManagedUserTestBase::TearDown() { 208 void ManagedUserTestBase::TearDown() {
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 // Confirm deletion. 425 // Confirm deletion.
425 JSEval(StringPrintf( 426 JSEval(StringPrintf(
426 "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()", 427 "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()",
427 user_index)); 428 user_index));
428 429
429 // Make sure there is no supervised user in list. 430 // Make sure there is no supervised user in list.
430 ASSERT_EQ(original_user_count - 1, UserManager::Get()->GetUsers().size()); 431 ASSERT_EQ(original_user_count - 1, UserManager::Get()->GetUsers().size());
431 } 432 }
432 433
433 } // namespace chromeos 434 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698