commit 60ea15d40a3ad77536e01f2bb780181aa9c3c084
author Samuel Tan <samueltan@google.com> Tue Jan 19 15:31:26 2016 -0800
committer Samuel Tan <samueltan@google.com> Wed Jan 20 10:22:00 2016 -0800
tree 0ac1656f3e5babcf502137058cf6c32eb2e3c0e9
parent 77de52608da01d17957e6b8f07c2e49015ae2264

shill: refactor ChromeosDaemon

Refactor ChromeosDaemon so that it no longer inherits
from brillo::Daemon. This is necessary to allow its unit
tests to run without the extra base::ExitManager inherited
from brillo::Daemon.

Do this by introducing a new ShillDaemon class, which inherits
the logic in ChromeosDaemon, and overrides brillo::Daemon
methods.

BUG: 26653263
Change-Id: Ia256bc540d261fb183aae0100946afdcdea80fb3
TEST: shill compiles and unit tests pass on Android.
TEST: shill compiles and unit tests pass on Chrome OS.

shill.gyp

diff --git a/shill.gyp b/shill.gyp
index 1a4f0cf..89e1884 100644
--- a/shill.gyp
+++ b/shill.gyp
@@ -526,6 +526,7 @@
         'service_property_change_notifier.cc',
         'shill_ares.cc',
         'shill_config.cc',
+        'shill_daemon.cc',
         'shill_test_config.cc',
         'socket_info.cc',
         'socket_info_reader.cc',