Fix flaky tests in EndToEndAsyncTest in dbus_unittests.

dbus/end_to_end_async_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 46 matching lines @@
 
     // Connect to the "Test" signal of "org.chromium.TestInterface" from
     // the remote object.
     object_proxy_->ConnectToSignal(
         "org.chromium.TestInterface",
         "Test",
         base::Bind(&EndToEndAsyncTest::OnTestSignal,
                    base::Unretained(this)),
         base::Bind(&EndToEndAsyncTest::OnConnected,
                    base::Unretained(this)));
+    // Wait until the object proxy is connected to the signal.
+    message_loop_.Run();
+
     // Connect to the "Test2" signal of "org.chromium.TestInterface" from
     // the remote object. There was a bug where we were emitting error
     // messages like "Requested to remove an unknown match rule: ..." at
     // the shutdown of Bus when an object proxy is connected to more than
     // one signal of the same interface. See crosbug.com/23382 for details.
     object_proxy_->ConnectToSignal(
         "org.chromium.TestInterface",
         "Test2",
         base::Bind(&EndToEndAsyncTest::OnTest2Signal,
                    base::Unretained(this)),
@@ skipping 201 matching lines @@
                             dbus::ObjectProxy::EmptyResponseCallback());
   // Post a delayed task to quit the message loop.
   message_loop_.PostDelayedTask(FROM_HERE,
                                 MessageLoop::QuitClosure(),
                                 TestTimeouts::tiny_timeout_ms());
   message_loop_.Run();
   // We cannot tell if the empty callback is called, but at least we can
   // check if the test does not crash.
 }
 
-// Flaky, http://crbug.com/107301
-TEST_F(EndToEndAsyncTest, FLAKY_TestSignal) {
+TEST_F(EndToEndAsyncTest, TestSignal) {
   const char kMessage[] = "hello, world";
   // Send the test signal from the exported object.
   test_service_->SendTestSignal(kMessage);
   // Receive the signal with the object proxy. The signal is handled in
   // EndToEndAsyncTest::OnTestSignal() in the main thread.
   WaitForTestSignal();
   ASSERT_EQ(kMessage, test_signal_string_);
 }
 
-// Flaky, http://crbug.com/106796
-TEST_F(EndToEndAsyncTest, FLAKY_TestSignalFromRoot) {
+TEST_F(EndToEndAsyncTest, TestSignalFromRoot) {
   const char kMessage[] = "hello, world";
   // Send the test signal from the root object path, to see if we can
   // handle signals sent from "/", like dbus-send does.
   test_service_->SendTestSignalFromRoot(kMessage);
   // Receive the signal with the object proxy. The signal is handled in
   // EndToEndAsyncTest::OnTestSignal() in the main thread.
   WaitForTestSignal();
   ASSERT_EQ(kMessage, test_signal_string_);
 }