Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Unified Diff: remoting/test/protocol_perftest.cc

Issue 586943002: Fix crash in protocol perf test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/test/protocol_perftest.cc
diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc
index 6e216b00615f8e8e067f783ac14d41068386321f..25c36c6d12c75078f3ab0dcdfb61759a782f86ea 100644
--- a/remoting/test/protocol_perftest.cc
+++ b/remoting/test/protocol_perftest.cc
@@ -61,6 +61,16 @@ struct NetworkPerformanceParams {
double out_of_order_rate;
};
+class FakeCursorShapeStub : public protocol::CursorShapeStub {
+ public:
+ FakeCursorShapeStub() {}
+ virtual ~FakeCursorShapeStub() {}
+
+ // protocol::CursorShapeStub interface.
+ virtual void SetCursorShape(
+ const protocol::CursorShapeInfo& cursor_shape) OVERRIDE {};
+};
+
class ProtocolPerfTest
: public testing::Test,
public testing::WithParamInterface<NetworkPerformanceParams>,
@@ -108,7 +118,7 @@ class ProtocolPerfTest
return NULL;
}
virtual protocol::CursorShapeStub* GetCursorShapeStub() OVERRIDE {
- return NULL;
+ return &cursor_shape_stub_;
}
// VideoRenderer interface.
@@ -335,6 +345,8 @@ class ProtocolPerfTest
base::Thread encode_thread_;
FakeDesktopEnvironmentFactory desktop_environment_factory_;
+ FakeCursorShapeStub cursor_shape_stub_;
+
scoped_ptr<protocol::CandidateSessionConfig> protocol_config_;
scoped_ptr<FakeSignalStrategy> host_signaling_;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698