| Index: sync/js/js_test_util.h
|
| diff --git a/sync/js/js_test_util.h b/sync/js/js_test_util.h
|
| index 8f9824837f879295df507fa1e0935a30d302fc92..b5ae4e8d78ae58c217cf94ffe89c3332c0370b30 100644
|
| --- a/sync/js/js_test_util.h
|
| +++ b/sync/js/js_test_util.h
|
| @@ -13,7 +13,6 @@
|
| #include "sync/js/js_backend.h"
|
| #include "sync/js/js_controller.h"
|
| #include "sync/js/js_event_handler.h"
|
| -#include "sync/js/js_reply_handler.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| namespace base {
|
| @@ -23,18 +22,11 @@ class ListValue;
|
|
|
| namespace syncer {
|
|
|
| -class JsArgList;
|
| class JsEventDetails;
|
|
|
| // Defined for googletest. Equivalent to "*os << args.ToString()".
|
| -void PrintTo(const JsArgList& args, ::std::ostream* os);
|
| void PrintTo(const JsEventDetails& details, ::std::ostream* os);
|
|
|
| -// A gmock matcher for JsArgList. Use like:
|
| -//
|
| -// EXPECT_CALL(mock, HandleJsReply("foo", HasArgs(expected_args)));
|
| -::testing::Matcher<const JsArgList&> HasArgs(const JsArgList& expected_args);
|
| -
|
| // A gmock matcher for JsEventDetails. Use like:
|
| //
|
| // EXPECT_CALL(mock, HandleJsEvent("foo", HasArgs(expected_details)));
|
| @@ -56,8 +48,6 @@ class MockJsBackend : public JsBackend,
|
| WeakHandle<JsBackend> AsWeakHandle();
|
|
|
| MOCK_METHOD1(SetJsEventHandler, void(const WeakHandle<JsEventHandler>&));
|
| - MOCK_METHOD3(ProcessJsMessage, void(const ::std::string&, const JsArgList&,
|
| - const WeakHandle<JsReplyHandler>&));
|
| };
|
|
|
| class MockJsController : public JsController,
|
| @@ -68,9 +58,6 @@ class MockJsController : public JsController,
|
|
|
| MOCK_METHOD1(AddJsEventHandler, void(JsEventHandler*));
|
| MOCK_METHOD1(RemoveJsEventHandler, void(JsEventHandler*));
|
| - MOCK_METHOD3(ProcessJsMessage,
|
| - void(const ::std::string&, const JsArgList&,
|
| - const WeakHandle<JsReplyHandler>&));
|
| };
|
|
|
| class MockJsEventHandler
|
| @@ -86,19 +73,6 @@ class MockJsEventHandler
|
| void(const ::std::string&, const JsEventDetails&));
|
| };
|
|
|
| -class MockJsReplyHandler
|
| - : public JsReplyHandler,
|
| - public base::SupportsWeakPtr<MockJsReplyHandler> {
|
| - public:
|
| - MockJsReplyHandler();
|
| - virtual ~MockJsReplyHandler();
|
| -
|
| - WeakHandle<JsReplyHandler> AsWeakHandle();
|
| -
|
| - MOCK_METHOD2(HandleJsReply,
|
| - void(const ::std::string&, const JsArgList&));
|
| -};
|
| -
|
| } // namespace syncer
|
|
|
| #endif // SYNC_JS_JS_TEST_UTIL_H_
|
|
|