dbus: Add ObjectProxy::WaitForServiceToBeAvailable()

Split ConnectToNameOwnerChangedSignal() from ConnectToSignalInternal().
Add WaitForServiceToBeAvailable()
Add test.

BUG=141009
TEST=dbus_unittests
R=satorux@chromium.org

Review URL: https://codereview.chromium.org/25488002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226428 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 76 insertions, 0 deletions

diff --git a/dbus/object_proxy_unittest.cc b/dbus/object_proxy_unittest.cc
new file mode 100644
index 0000000..1cf667c
--- /dev/null
+++ b/dbus/object_proxy_unittest.cc
@@ -0,0 +1,76 @@
+// Copyright 2013 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 "base/bind.h"
+#include "base/memory/ref_counted.h"
+#include "base/run_loop.h"
+#include "dbus/bus.h"
+#include "dbus/object_proxy.h"
+#include "dbus/test_service.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace dbus {
+namespace {
+
+class ObjectProxyTest : public testing::Test {
+ protected:
+  virtual void SetUp() OVERRIDE {
+    Bus::Options bus_options;
+    bus_options.bus_type = Bus::SESSION;
+    bus_options.connection_type = Bus::PRIVATE;
+    bus_ = new Bus(bus_options);
+
+    object_proxy_ = bus_->GetObjectProxy(
+        "org.chromium.TestService", ObjectPath("/org/chromium/TestObject"));
+  }
+
+  virtual void TearDown() OVERRIDE {
+    bus_->ShutdownAndBlock();
+  }
+
+  base::MessageLoopForIO message_loop_;
+  scoped_refptr<Bus> bus_;
+  ObjectProxy* object_proxy_;
+};
+
+// Used as a WaitForServiceToBeAvailableCallback.
+void OnServiceIsAvailable(scoped_ptr<base::RunLoop>* run_loop,
+                          bool service_is_available) {
+  EXPECT_TRUE(service_is_available);
+  ASSERT_TRUE(*run_loop);
+  (*run_loop)->Quit();
+}
+
+TEST_F(ObjectProxyTest, WaitForServiceToBeAvailable) {
+  scoped_ptr<base::RunLoop> run_loop;
+
+  // Callback is not yet called because the service is not available.
+  object_proxy_->WaitForServiceToBeAvailable(
+      base::Bind(&OnServiceIsAvailable, &run_loop));
+  base::RunLoop().RunUntilIdle();
+
+  // Start the service.
+  TestService::Options options;
+  TestService test_service(options);
+  ASSERT_TRUE(test_service.StartService());
+  ASSERT_TRUE(test_service.WaitUntilServiceIsStarted());
+  ASSERT_TRUE(test_service.has_ownership());
+
+  // Callback is called beacuse the service became available.
+  run_loop.reset(new base::RunLoop);
+  run_loop->Run();
+
+  // Callback is called because the service is already available.
+  run_loop.reset(new base::RunLoop);
+  object_proxy_->WaitForServiceToBeAvailable(
+      base::Bind(&OnServiceIsAvailable, &run_loop));
+  run_loop->Run();
+
+  // Shut down the service.
+  test_service.ShutdownAndBlock();
+  test_service.Stop();
+}
+
+}  // namespace
+}  // namespace dbus