| 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 "base/bind.h" |    5 #include "base/bind.h" | 
|    6 #include "base/memory/scoped_ptr.h" |    6 #include "base/memory/scoped_ptr.h" | 
|    7 #include "base/message_loop.h" |    7 #include "base/message_loop.h" | 
|    8 #include "base/metrics/histogram.h" |    8 #include "base/metrics/histogram.h" | 
|    9 #include "base/metrics/histogram_samples.h" |    9 #include "base/metrics/histogram_samples.h" | 
|   10 #include "base/metrics/statistics_recorder.h" |   10 #include "base/metrics/statistics_recorder.h" | 
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  240   ASSERT_FALSE(latest_name_owner_.empty()); |  240   ASSERT_FALSE(latest_name_owner_.empty()); | 
|  241  |  241  | 
|  242   // Now the second service owns the name. |  242   // Now the second service owns the name. | 
|  243   const char kNewMessage[] = "hello, new world"; |  243   const char kNewMessage[] = "hello, new world"; | 
|  244  |  244  | 
|  245   test_service2_->SendTestSignal(kNewMessage); |  245   test_service2_->SendTestSignal(kNewMessage); | 
|  246   WaitForTestSignal(); |  246   WaitForTestSignal(); | 
|  247   ASSERT_EQ(kNewMessage, test_signal_string_); |  247   ASSERT_EQ(kNewMessage, test_signal_string_); | 
|  248 } |  248 } | 
|  249  |  249  | 
|  250 TEST_F(SignalSenderVerificationTest, TestMultipleObjects) { |  250 // Fails on Linux ChromiumOS Tests | 
 |  251 TEST_F(SignalSenderVerificationTest, DISABLED_TestMultipleObjects) { | 
|  251   const char kMessage[] = "hello, world"; |  252   const char kMessage[] = "hello, world"; | 
|  252  |  253  | 
|  253   dbus::ObjectProxy* object_proxy2 = bus_->GetObjectProxy( |  254   dbus::ObjectProxy* object_proxy2 = bus_->GetObjectProxy( | 
|  254       "org.chromium.TestService", |  255       "org.chromium.TestService", | 
|  255       dbus::ObjectPath("/org/chromium/DifferentObject")); |  256       dbus::ObjectPath("/org/chromium/DifferentObject")); | 
|  256  |  257  | 
|  257   bool second_name_owner_changed_called = false; |  258   bool second_name_owner_changed_called = false; | 
|  258   object_proxy2->SetNameOwnerChangedCallback( |  259   object_proxy2->SetNameOwnerChangedCallback( | 
|  259       base::Bind(&SignalSenderVerificationTest::OnNameOwnerChanged, |  260       base::Bind(&SignalSenderVerificationTest::OnNameOwnerChanged, | 
|  260                  base::Unretained(this), |  261                  base::Unretained(this), | 
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  306   // latest_name_owner_ becomes non empty as the new owner appears. |  307   // latest_name_owner_ becomes non empty as the new owner appears. | 
|  307   ASSERT_FALSE(latest_name_owner_.empty()); |  308   ASSERT_FALSE(latest_name_owner_.empty()); | 
|  308  |  309  | 
|  309   // Now the second service owns the name. |  310   // Now the second service owns the name. | 
|  310   const char kNewMessage[] = "hello, new world"; |  311   const char kNewMessage[] = "hello, new world"; | 
|  311  |  312  | 
|  312   test_service2_->SendTestSignal(kNewMessage); |  313   test_service2_->SendTestSignal(kNewMessage); | 
|  313   WaitForTestSignal(); |  314   WaitForTestSignal(); | 
|  314   ASSERT_EQ(kNewMessage, test_signal_string_); |  315   ASSERT_EQ(kNewMessage, test_signal_string_); | 
|  315 } |  316 } | 
| OLD | NEW |