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

Side by Side Diff: chromeos/network/network_configuration_handler_unittest.cc

Issue 1556773002: Convert Pass()→std::move() in //chromeos (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 dictionary_value_result_(NULL) {} 181 dictionary_value_result_(NULL) {}
182 ~NetworkConfigurationHandlerTest() override {} 182 ~NetworkConfigurationHandlerTest() override {}
183 183
184 void SetUp() override { 184 void SetUp() override {
185 scoped_ptr<DBusThreadManagerSetter> dbus_setter = 185 scoped_ptr<DBusThreadManagerSetter> dbus_setter =
186 DBusThreadManager::GetSetterForTesting(); 186 DBusThreadManager::GetSetterForTesting();
187 mock_manager_client_ = new MockShillManagerClient(); 187 mock_manager_client_ = new MockShillManagerClient();
188 mock_profile_client_ = new MockShillProfileClient(); 188 mock_profile_client_ = new MockShillProfileClient();
189 mock_service_client_ = new MockShillServiceClient(); 189 mock_service_client_ = new MockShillServiceClient();
190 dbus_setter->SetShillManagerClient( 190 dbus_setter->SetShillManagerClient(
191 scoped_ptr<ShillManagerClient>(mock_manager_client_).Pass()); 191 scoped_ptr<ShillManagerClient>(mock_manager_client_));
192 dbus_setter->SetShillProfileClient( 192 dbus_setter->SetShillProfileClient(
193 scoped_ptr<ShillProfileClient>(mock_profile_client_).Pass()); 193 scoped_ptr<ShillProfileClient>(mock_profile_client_));
194 dbus_setter->SetShillServiceClient( 194 dbus_setter->SetShillServiceClient(
195 scoped_ptr<ShillServiceClient>(mock_service_client_).Pass()); 195 scoped_ptr<ShillServiceClient>(mock_service_client_));
196 196
197 EXPECT_CALL(*mock_service_client_, GetProperties(_, _)).Times(AnyNumber()); 197 EXPECT_CALL(*mock_service_client_, GetProperties(_, _)).Times(AnyNumber());
198 EXPECT_CALL(*mock_manager_client_, GetProperties(_)).Times(AnyNumber()); 198 EXPECT_CALL(*mock_manager_client_, GetProperties(_)).Times(AnyNumber());
199 EXPECT_CALL(*mock_manager_client_, AddPropertyChangedObserver(_)) 199 EXPECT_CALL(*mock_manager_client_, AddPropertyChangedObserver(_))
200 .Times(AnyNumber()); 200 .Times(AnyNumber());
201 EXPECT_CALL(*mock_manager_client_, RemovePropertyChangedObserver(_)) 201 EXPECT_CALL(*mock_manager_client_, RemovePropertyChangedObserver(_))
202 .Times(AnyNumber()); 202 .Times(AnyNumber());
203 203
204 network_state_handler_.reset(NetworkStateHandler::InitializeForTest()); 204 network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
205 network_configuration_handler_.reset(new NetworkConfigurationHandler()); 205 network_configuration_handler_.reset(new NetworkConfigurationHandler());
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 EXPECT_FALSE(test_observer->HasConfiguration(service_path)); 743 EXPECT_FALSE(test_observer->HasConfiguration(service_path));
744 EXPECT_FALSE(test_observer->HasConfigurationInProfile( 744 EXPECT_FALSE(test_observer->HasConfigurationInProfile(
745 service_path, NetworkProfileHandler::GetSharedProfilePath())); 745 service_path, NetworkProfileHandler::GetSharedProfilePath()));
746 EXPECT_FALSE( 746 EXPECT_FALSE(
747 test_observer->HasConfigurationInProfile(service_path, user_profile)); 747 test_observer->HasConfigurationInProfile(service_path, user_profile));
748 748
749 network_configuration_handler_->RemoveObserver(test_observer.get()); 749 network_configuration_handler_->RemoveObserver(test_observer.get());
750 } 750 }
751 751
752 } // namespace chromeos 752 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/managed_network_configuration_handler_unittest.cc ('k') | chromeos/network/network_device_handler_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698