commit f75ac09391ad80aa6b6db0c2b92a99732233e096
author Peter Qiu <zqiu@chromium.org> Tue Aug 11 12:49:39 2015 -0700
committer chrome-bot <chrome-bot@chromium.org> Fri Aug 28 16:44:29 2015 -0700
tree 4513088d60cca86ffa73212b1ab8a8cbc3b62479
parent f365fd00209e72eae123f6663c94b9b5fe3a3d44

shill: DeviceClaimer: use service watcher to monitor remote service

This removes the dependency for DBusManager and DBusNameWatcher from
DeviceClaimer.

This is a part of a series CLs that migrate shill over to chromeos dbus.

BUG=chromium:517680
TEST=USE="asan clang chromeos_dbus" FEATURES=test emerge-$BOARD shill

Change-Id: I052ad62246aef81043fc2bbe3be6892569d63062
Reviewed-on: https://chromium-review.googlesource.com/292840
Commit-Ready: Zeping Qiu <zqiu@chromium.org>
Tested-by: Zeping Qiu <zqiu@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>

device_claimer_unittest.cc

diff --git a/device_claimer_unittest.cc b/device_claimer_unittest.cc
index bfae017..b61631e 100644
--- a/device_claimer_unittest.cc
+++ b/device_claimer_unittest.cc
@@ -9,8 +9,9 @@
 #include <gtest/gtest.h>
 
 #include "shill/error.h"
-#include "shill/mock_dbus_manager.h"
+#include "shill/mock_control.h"
 #include "shill/mock_device_info.h"
+#include "shill/mock_service_watcher.h"
 
 using std::string;
 using ::testing::_;
@@ -19,7 +20,7 @@
 
 namespace shill {
 
-const char kDBusServiceName[] = "org.chromium.TestService";
+const char kServiceName[] = "org.chromium.TestService";
 const char kTestDevice1Name[] = "test_device1";
 const char kTestDevice2Name[] = "test_device2";
 
@@ -27,39 +28,26 @@
  public:
   DeviceClaimerTest()
      : device_info_(nullptr, nullptr, nullptr, nullptr),
-       device_claimer_(kDBusServiceName, &device_info_, false) {}
+       device_claimer_(kServiceName, &device_info_, false) {}
 
  protected:
   MockDeviceInfo device_info_;
   DeviceClaimer device_claimer_;
 };
 
-TEST_F(DeviceClaimerTest, StartDBusNameWatcher) {
-  // Setup DBus name watcher.
-  MockDBusManager dbus_manager;
-  DBusNameWatcher* name_watcher =
-      new DBusNameWatcher(&dbus_manager,
-                          kDBusServiceName,
-                          DBusNameWatcher::NameAppearedCallback(),
-                          DBusNameWatcher::NameVanishedCallback());
+TEST_F(DeviceClaimerTest, StartServiceWatcher) {
+  // Start service watcher.
+  MockControl control;
+  EXPECT_CALL(control, CreateRPCServiceWatcher(_, _))
+      .WillOnce(Return(new MockServiceWatcher()));
+  EXPECT_TRUE(device_claimer_.StartServiceWatcher(&control, base::Closure()));
+  Mock::VerifyAndClearExpectations(&control);
 
-  // Start DBus name watcher.
-  EXPECT_CALL(dbus_manager, CreateNameWatcher(kDBusServiceName, _, _))
-      .WillOnce(Return(name_watcher));
-  EXPECT_TRUE(device_claimer_.StartDBusNameWatcher(
-      &dbus_manager,
-      DBusNameWatcher::NameAppearedCallback(),
-      DBusNameWatcher::NameVanishedCallback()));
-  Mock::VerifyAndClearExpectations(&dbus_manager);
-
-  // Start DBus name watcher again, should fail since name watcher already
+  // Start service watcher again, should fail since name watcher already
   // started.
-  EXPECT_CALL(dbus_manager, CreateNameWatcher(_, _, _)).Times(0);
-  EXPECT_FALSE(device_claimer_.StartDBusNameWatcher(
-      &dbus_manager,
-      DBusNameWatcher::NameAppearedCallback(),
-      DBusNameWatcher::NameVanishedCallback()));
-  Mock::VerifyAndClearExpectations(&dbus_manager);
+  EXPECT_CALL(control, CreateRPCServiceWatcher(_, _)).Times(0);
+  EXPECT_FALSE(device_claimer_.StartServiceWatcher(&control, base::Closure()));
+  Mock::VerifyAndClearExpectations(&control);
 }
 
 TEST_F(DeviceClaimerTest, ClaimAndReleaseDevices) {