shill: Don't create DHCP and Modem D-Bus proxies in signal callbacks.
dbus-c++ doesn't allow proxy creation in signal callbacks so create them in
deferred tasks instead.
BUG=chromium-os:18228
TEST=unit tests, tested on device
Change-Id: I4f85ab937aef99ef4556c5a3c16af913d8fa08fd
Reviewed-on: http://gerrit.chromium.org/gerrit/4827
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
diff --git a/shill_unittest.cc b/shill_unittest.cc
index c703b85..5d67369 100644
--- a/shill_unittest.cc
+++ b/shill_unittest.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include <stdint.h>
-#include <glib.h>
#include <base/callback_old.h>
#include <base/logging.h>
@@ -15,7 +14,6 @@
#include "shill/io_handler.h"
#include "shill/mock_control.h"
-#include "shill/mock_glib.h"
#include "shill/shill_config.h"
#include "shill/shill_daemon.h"
@@ -111,7 +109,7 @@
class ShillDaemonTest : public Test {
public:
ShillDaemonTest()
- : daemon_(&config_, new MockControl(), &glib_),
+ : daemon_(&config_, new MockControl()),
device_info_(daemon_.control_, dispatcher_, &daemon_.manager_),
dispatcher_(&daemon_.dispatcher_),
dispatcher_test_(dispatcher_),
@@ -125,7 +123,6 @@
}
protected:
Config config_;
- MockGLib glib_;
Daemon daemon_;
DeviceInfo device_info_;
EventDispatcher *dispatcher_;