| OLD | NEW |
| 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 "chromeos/network/network_state_handler.h" | 5 #include "chromeos/network/network_state_handler.h" |
| 6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 7 #include <map> | 9 #include <map> |
| 8 #include <set> | 10 #include <set> |
| 9 #include <string> | 11 #include <string> |
| 10 | 12 |
| 11 #include "base/bind.h" | 13 #include "base/bind.h" |
| 14 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/message_loop/message_loop.h" | 16 #include "base/message_loop/message_loop.h" |
| 14 #include "base/values.h" | 17 #include "base/values.h" |
| 15 #include "chromeos/dbus/dbus_thread_manager.h" | 18 #include "chromeos/dbus/dbus_thread_manager.h" |
| 16 #include "chromeos/dbus/shill_device_client.h" | 19 #include "chromeos/dbus/shill_device_client.h" |
| 17 #include "chromeos/dbus/shill_ipconfig_client.h" | 20 #include "chromeos/dbus/shill_ipconfig_client.h" |
| 18 #include "chromeos/dbus/shill_manager_client.h" | 21 #include "chromeos/dbus/shill_manager_client.h" |
| 19 #include "chromeos/dbus/shill_profile_client.h" | 22 #include "chromeos/dbus/shill_profile_client.h" |
| 20 #include "chromeos/dbus/shill_service_client.h" | 23 #include "chromeos/dbus/shill_service_client.h" |
| 21 #include "chromeos/network/device_state.h" | 24 #include "chromeos/network/device_state.h" |
| (...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 794 kShillManagerClientStubDefaultWifi, shill::kIPConfigProperty, | 797 kShillManagerClientStubDefaultWifi, shill::kIPConfigProperty, |
| 795 base::StringValue(kIPConfigPath)); | 798 base::StringValue(kIPConfigPath)); |
| 796 UpdateManagerProperties(); | 799 UpdateManagerProperties(); |
| 797 EXPECT_EQ(1, test_observer_->PropertyUpdatesForDevice( | 800 EXPECT_EQ(1, test_observer_->PropertyUpdatesForDevice( |
| 798 kShillManagerClientStubWifiDevice)); | 801 kShillManagerClientStubWifiDevice)); |
| 799 EXPECT_EQ(1, test_observer_->PropertyUpdatesForService( | 802 EXPECT_EQ(1, test_observer_->PropertyUpdatesForService( |
| 800 kShillManagerClientStubDefaultWifi)); | 803 kShillManagerClientStubDefaultWifi)); |
| 801 } | 804 } |
| 802 | 805 |
| 803 } // namespace chromeos | 806 } // namespace chromeos |
| OLD | NEW |