[Android] Convert RestartAdbd to DeviceUtils again.

build/android/pylib/device/device_utils_device_test.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """
 Unit tests for the contents of device_utils.py (mostly DeviceUtils).
 The test will invoke real devices
 """
 
@@ skipping 189 matching lines @@
     self.assertEqual(_OLD_CONTENTS, result)
 
     result = self.device.RunShellCommand(["ls", "%s/%s/%s"
                                           % (_DEVICE_DIR, _SUB_DIR, _SUB_DIR2)],
                                          single_line=True)
     self.assertEqual('', result)
 
     self.device.RunShellCommand(['rm', '-rf',  _DEVICE_DIR])
     cmd_helper.RunCmd(['rm', '-rf', host_tmp_dir])
 
+  def testRestartAdbd(self):
+    old_adbd_pid = self.device.RunShellCommand(
+        ['ps', '|', 'grep', 'adbd'])[1].split()[1]
+    self.device.RestartAdbd()
+    new_adbd_pid = self.device.RunShellCommand(
+        ['ps', '|', 'grep', 'adbd'])[1].split()[1]
+    self.assertNotEqual(old_adbd_pid, new_adbd_pid)
+
+
 if __name__ == '__main__':
   unittest.main()