shill: Add a mockable layer for socket.h.
Mock the layer in device_info_unittest.cc. Some cleanup.
BUG=chromium-os:17394
TEST=unit tests
Change-Id: I2ddcb2fd0e01418a463596bf4e3a804b3e3023b2
Reviewed-on: http://gerrit.chromium.org/gerrit/3807
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>
diff --git a/shill_daemon.h b/shill_daemon.h
index 9ccf841..3a6557a 100644
--- a/shill_daemon.h
+++ b/shill_daemon.h
@@ -1,37 +1,39 @@
-// Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SHILL_H_
-#define SHILL_H_
+#ifndef SHILL_DAEMON_H_
+#define SHILL_DAEMON_H_
-#include <string>
-
-#include <ctime>
-
-#include "shill/shill_config.h"
-#include "shill/control_interface.h"
-#include "shill/shill_event.h"
#include "shill/manager.h"
+#include "shill/shill_event.h"
+#include "shill/sockets.h"
namespace shill {
+class Config;
+class ControlInterface;
+
class Daemon {
public:
- explicit Daemon(Config *config, ControlInterface *control);
+ Daemon(Config *config, ControlInterface *control);
~Daemon();
+
void Start();
void Run();
private:
+ friend class ShillDaemonTest;
+
ControlInterface *CreateControl();
+
Config *config_;
ControlInterface *control_;
Manager manager_;
EventDispatcher dispatcher_;
- friend class ShillDaemonTest;
+ Sockets sockets_;
};
} // namespace shill
-#endif // SHILL_H_
+#endif // SHILL_DAEMON_H_