| 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 <stddef.h> |
| 6 |
| 5 #include <algorithm> | 7 #include <algorithm> |
| 6 #include <string> | 8 #include <string> |
| 7 #include <vector> | 9 #include <vector> |
| 8 | 10 |
| 9 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
| 12 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
| 13 #include "base/stl_util.h" | 16 #include "base/stl_util.h" |
| 14 #include "base/test/test_timeouts.h" | 17 #include "base/test/test_timeouts.h" |
| 15 #include "base/threading/thread.h" | 18 #include "base/threading/thread.h" |
| 16 #include "base/threading/thread_restrictions.h" | 19 #include "base/threading/thread_restrictions.h" |
| 17 #include "dbus/bus.h" | 20 #include "dbus/bus.h" |
| 18 #include "dbus/message.h" | 21 #include "dbus/message.h" |
| 19 #include "dbus/object_path.h" | 22 #include "dbus/object_path.h" |
| (...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 test_service_->SendTestSignal(kMessage); | 658 test_service_->SendTestSignal(kMessage); |
| 656 // Receive the signal with the object proxy. | 659 // Receive the signal with the object proxy. |
| 657 WaitForTestSignal(); | 660 WaitForTestSignal(); |
| 658 // Verify the string WAS received by the original handler. | 661 // Verify the string WAS received by the original handler. |
| 659 ASSERT_EQ(kMessage, test_signal_string_); | 662 ASSERT_EQ(kMessage, test_signal_string_); |
| 660 // Verify the signal WAS ALSO received by the additional handler. | 663 // Verify the signal WAS ALSO received by the additional handler. |
| 661 ASSERT_EQ(kMessage, additional_test_signal_string_); | 664 ASSERT_EQ(kMessage, additional_test_signal_string_); |
| 662 } | 665 } |
| 663 | 666 |
| 664 } // namespace dbus | 667 } // namespace dbus |
| OLD | NEW |