Fix MockCommands and include header in build

Change-Id: Ic8bdbddec9c857a43f1118ad18047da367e02df6
Reviewed-on: https://weave-review.googlesource.com/1229
Reviewed-by: Alex Vakulenko <avakulenko@google.com>

libweave/include/weave/test/mock_commands.h

diff --git a/libweave/include/weave/test/mock_commands.h b/libweave/include/weave/test/mock_commands.h
index 4e2d8ce..685fd07 100644
--- a/libweave/include/weave/test/mock_commands.h
+++ b/libweave/include/weave/test/mock_commands.h
@@ -20,7 +20,7 @@
 
   MOCK_METHOD1(AddOnCommandAddedCallback, void(const OnCommandCallback&));
   MOCK_METHOD1(AddOnCommandRemovedCallback, void(const OnCommandCallback&));
-  MOCK_METHOD4(AddCommand,
+  MOCK_METHOD3(AddCommand,
                bool(const base::DictionaryValue&, std::string*, ErrorPtr*));
   MOCK_METHOD1(FindCommand, Command*(const std::string&));
 };

libweave/src/weave_unittest.cc

diff --git a/libweave/src/weave_unittest.cc b/libweave/src/weave_unittest.cc
index 8776ba6..28edb82 100644
--- a/libweave/src/weave_unittest.cc
+++ b/libweave/src/weave_unittest.cc
@@ -14,6 +14,7 @@
 #include <weave/provider/test/mock_http_server.h>
 #include <weave/provider/test/mock_network.h>
 #include <weave/provider/test/mock_wifi.h>
+#include <weave/test/mock_commands.h>
 #include <weave/test/unittest_utils.h>
 
 #include "src/bind_lambda.h"