diff --git a/nice_mock_control.h b/nice_mock_control.h
new file mode 100644
index 0000000..b8686f4
--- /dev/null
+++ b/nice_mock_control.h
@@ -0,0 +1,34 @@
+// 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_NICE_MOCK_CONTROL_
+#define SHILL_NICE_MOCK_CONTROL_
+
+#include <base/basictypes.h>
+
+#include "shill/control_interface.h"
+
+namespace shill {
+// An implementation of the Shill RPC-channel-interface-factory interface that
+// returns nice mocks.
+class NiceMockControl : public ControlInterface {
+ public:
+  NiceMockControl();
+  virtual ~NiceMockControl();
+
+  // Each of these can be called once.  Ownership of the appropriate
+  // interface pointer is given up upon call.
+  virtual DeviceAdaptorInterface *CreateDeviceAdaptor(Device *device);
+  virtual IPConfigAdaptorInterface *CreateIPConfigAdaptor(IPConfig *config);
+  virtual ManagerAdaptorInterface *CreateManagerAdaptor(Manager *manager);
+  virtual ProfileAdaptorInterface *CreateProfileAdaptor(Profile *profile);
+  virtual ServiceAdaptorInterface *CreateServiceAdaptor(Service *service);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(NiceMockControl);
+};
+
+}  // namespace shill
+
+#endif  // SHILL_NICE_MOCK_CONTROL_