OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 <iostream> | 5 #include <iostream> |
6 #include <sstream> | 6 #include <sstream> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
| 11 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
12 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
13 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
14 #include "base/stl_util.h" | 15 #include "base/stl_util.h" |
15 #include "base/thread_task_runner_handle.h" | 16 #include "base/thread_task_runner_handle.h" |
16 #include "base/values.h" | 17 #include "base/values.h" |
17 #include "chromeos/dbus/dbus_thread_manager.h" | 18 #include "chromeos/dbus/dbus_thread_manager.h" |
18 #include "chromeos/dbus/mock_shill_manager_client.h" | 19 #include "chromeos/dbus/mock_shill_manager_client.h" |
19 #include "chromeos/dbus/mock_shill_profile_client.h" | 20 #include "chromeos/dbus/mock_shill_profile_client.h" |
20 #include "chromeos/dbus/mock_shill_service_client.h" | 21 #include "chromeos/dbus/mock_shill_service_client.h" |
(...skipping 955 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
976 EXPECT_CALL(*mock_profile_client_, | 977 EXPECT_CALL(*mock_profile_client_, |
977 GetProperties(dbus::ObjectPath(kUser1ProfilePath), _, _)); | 978 GetProperties(dbus::ObjectPath(kUser1ProfilePath), _, _)); |
978 | 979 |
979 SetPolicy(::onc::ONC_SOURCE_USER_POLICY, kUser1, "policy/policy_wifi1.onc"); | 980 SetPolicy(::onc::ONC_SOURCE_USER_POLICY, kUser1, "policy/policy_wifi1.onc"); |
980 managed_network_configuration_handler_->RemoveObserver(&policy_observer_); | 981 managed_network_configuration_handler_->RemoveObserver(&policy_observer_); |
981 managed_network_configuration_handler_.reset(); | 982 managed_network_configuration_handler_.reset(); |
982 message_loop_.RunUntilIdle(); | 983 message_loop_.RunUntilIdle(); |
983 } | 984 } |
984 | 985 |
985 } // namespace chromeos | 986 } // namespace chromeos |
OLD | NEW |