chromeos/network/managed_network_configuration_handler_unittest.cc - Issue 1431563005: Handle prohibited technologies in device policy ONC

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/network/managed_network_configuration_handler_unittest.cc

Issue 1431563005: Handle prohibited technologies in device policy ONC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« chromeos/network/managed_network_configuration_handler_impl.cc ('K') | « chromeos/network/managed_network_configuration_handler_impl.cc ('k') | chromeos/network/network_connection_handler_unittest.cc » ('j') | chromeos/network/network_state_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/network/managed_network_configuration_handler_unittest.cc

diff --git a/chromeos/network/managed_network_configuration_handler_unittest.cc b/chromeos/network/managed_network_configuration_handler_unittest.cc

index c95d6b1a87288f0e65fbb6d08edf8176c228af24..6580156ac068ef8ad0a73bfdb19a7b59a8aa1981 100644

--- a/chromeos/network/managed_network_configuration_handler_unittest.cc

+++ b/chromeos/network/managed_network_configuration_handler_unittest.cc

@@ -260,14 +260,13 @@ class ManagedNetworkConfigurationHandlerTest : public testing::Test {

network_configuration_handler_.reset(

NetworkConfigurationHandler::InitializeForTest(

network_state_handler_.get(),

- NULL /* no NetworkDeviceHandler */));

+ nullptr /* no NetworkDeviceHandler */));

managed_network_configuration_handler_.reset(

new ManagedNetworkConfigurationHandlerImpl());

managed_network_configuration_handler_->Init(

- network_state_handler_.get(),

- network_profile_handler_.get(),

- network_configuration_handler_.get(),

- NULL /* no DeviceHandler */);

+ network_state_handler_.get(), network_profile_handler_.get(),

+ network_configuration_handler_.get(), nullptr /* no DeviceHandler */,

+ nullptr /* no ProhibitedTechnologiesHandler */);

managed_network_configuration_handler_->AddObserver(&policy_observer_);

message_loop_.RunUntilIdle();

@@ -337,7 +336,10 @@ class ManagedNetworkConfigurationHandlerTest : public testing::Test {

// These calls occur in NetworkConfigurationHandler.

EXPECT_CALL(*mock_manager_client_, GetProperties(_)).Times(AnyNumber());

EXPECT_CALL(*mock_manager_client_,

- AddPropertyChangedObserver(_)).Times(AnyNumber());

+ SetProperty("ProhibitedTechnologies", _, _, _))

+ .Times(AnyNumber());

+ EXPECT_CALL(*mock_manager_client_, AddPropertyChangedObserver(_))

+ .Times(AnyNumber());

EXPECT_CALL(*mock_manager_client_,

RemovePropertyChangedObserver(_)).Times(AnyNumber());

}