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

Unified Diff: blimp/net/blimp_message_multiplexer_unittest.cc

Issue 1426993008: Serialize a subset of WebInputEvents to protobufs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed more comments Created 5 years, 1 month 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
Index: blimp/net/blimp_message_multiplexer_unittest.cc
diff --git a/blimp/net/blimp_message_multiplexer_unittest.cc b/blimp/net/blimp_message_multiplexer_unittest.cc
index 4c757b20b26feb79f2a85aac209fdd029681d486..7a4028f297e839a211646d16465fc695ab5a793d 100644
--- a/blimp/net/blimp_message_multiplexer_unittest.cc
+++ b/blimp/net/blimp_message_multiplexer_unittest.cc
@@ -35,7 +35,8 @@ class BlimpMessageMultiplexerTest : public testing::Test {
.WillRepeatedly(
DoAll(SaveArg<0>(&captured_message_), SaveArg<1>(&captured_cb_)));
- input_message_->mutable_input()->set_type(InputMessage::DRAG);
+ input_message_->mutable_input()->set_type(
+ InputMessage::Type_GestureScrollBegin);
navigation_message_->mutable_navigation()->set_type(
NavigationMessage::LOAD_URL);
}
@@ -57,7 +58,8 @@ TEST_F(BlimpMessageMultiplexerTest, TypeSetByMux) {
net::TestCompletionCallback cb_1;
input_processor_->ProcessMessage(input_message_.Pass(), cb_1.callback());
EXPECT_EQ(BlimpMessage::INPUT, captured_message_.type());
- EXPECT_EQ(InputMessage::DRAG, captured_message_.input().type());
+ EXPECT_EQ(InputMessage::Type_GestureScrollBegin,
+ captured_message_.input().type());
captured_cb_.Run(net::OK);
EXPECT_EQ(net::OK, cb_1.WaitForResult());
@@ -77,7 +79,8 @@ TEST_F(BlimpMessageMultiplexerTest, TypeSetByCaller) {
net::TestCompletionCallback cb_1;
input_processor_->ProcessMessage(input_message_.Pass(), cb_1.callback());
EXPECT_EQ(BlimpMessage::INPUT, captured_message_.type());
- EXPECT_EQ(InputMessage::DRAG, captured_message_.input().type());
+ EXPECT_EQ(InputMessage::Type_GestureScrollBegin,
+ captured_message_.input().type());
captured_cb_.Run(net::OK);
EXPECT_EQ(net::OK, cb_1.WaitForResult());
}
@@ -88,7 +91,8 @@ TEST_F(BlimpMessageMultiplexerTest, SenderTransience) {
input_processor_ = multiplexer_.CreateSenderForType(BlimpMessage::INPUT);
input_processor_->ProcessMessage(input_message_.Pass(), cb_3.callback());
EXPECT_EQ(BlimpMessage::INPUT, captured_message_.type());
- EXPECT_EQ(InputMessage::DRAG, captured_message_.input().type());
+ EXPECT_EQ(InputMessage::Type_GestureScrollBegin,
+ captured_message_.input().type());
captured_cb_.Run(net::OK);
EXPECT_EQ(net::OK, cb_3.WaitForResult());
}
@@ -100,7 +104,8 @@ TEST_F(BlimpMessageMultiplexerTest, SenderMultiplicity) {
multiplexer_.CreateSenderForType(BlimpMessage::INPUT);
input_processor_2->ProcessMessage(input_message_.Pass(), cb_4.callback());
EXPECT_EQ(BlimpMessage::INPUT, captured_message_.type());
- EXPECT_EQ(InputMessage::DRAG, captured_message_.input().type());
+ EXPECT_EQ(InputMessage::Type_GestureScrollBegin,
+ captured_message_.input().type());
captured_cb_.Run(net::ERR_INVALID_ARGUMENT);
EXPECT_EQ(net::ERR_INVALID_ARGUMENT, cb_4.WaitForResult());
}

Powered by Google App Engine
This is Rietveld 408576698