Make the terminal input class a Mock instance.

2 files changed, 4 insertions, 8 deletions

diff --git a/src/cmdline/mocks/terminal.cc b/src/cmdline/mocks/terminal.cc
index 2da6d515..fb274385 100644
--- a/src/cmdline/mocks/terminal.cc
+++ b/src/cmdline/mocks/terminal.cc
@@ -45,11 +45,6 @@ namespace aptitude
           .WillByDefault(Return(std::wstring()));
       }
 
-      shared_ptr<terminal_input> terminal_input::create()
-      {
-        return make_shared<terminal_input>();
-      }
-
       terminal_locale::terminal_locale()
       {
         EXPECT_CALL(*this, wcwidth(_))
diff --git a/src/cmdline/mocks/terminal.h b/src/cmdline/mocks/terminal.h
index a43c347a..08d088c4 100644
--- a/src/cmdline/mocks/terminal.h
+++ b/src/cmdline/mocks/terminal.h
@@ -66,17 +66,18 @@ namespace aptitude
         MOCK_METHOD0(flush, void());
       };
 
-      class terminal_input : public aptitude::cmdline::terminal_input
+      class terminal_input : public aptitude::cmdline::terminal_input,
+                             public aptitude::util::mocks::Mock<terminal_input>
       {
         friend boost::shared_ptr<terminal_input>
         boost::make_shared<terminal_input>();
 
+        MOCK_FRIENDS();
+
         terminal_input();
 
       public:
         MOCK_METHOD1(prompt_for_input, std::wstring(const std::wstring &));
-
-        static boost::shared_ptr<terminal_input> create();
       };
 
       class terminal_metrics : public aptitude::cmdline::terminal_metrics