summaryrefslogtreecommitdiffstats
path: root/blimp/net
diff options
context:
space:
mode:
authorhaibinlu <haibinlu@chromium.org>2015-12-17 13:29:44 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-17 21:30:53 +0000
commit81eee135b4be9f2e52b51cdfdb4e69e86cbcd112 (patch)
treecf1f5a917fa798bdccf1a8a8f0e2cef19291b8dc /blimp/net
parentd9349170f5d10cb390c8bfe1a8af40d0eebd0991 (diff)
downloadchromium_src-81eee135b4be9f2e52b51cdfdb4e69e86cbcd112.zip
chromium_src-81eee135b4be9f2e52b51cdfdb4e69e86cbcd112.tar.gz
chromium_src-81eee135b4be9f2e52b51cdfdb4e69e86cbcd112.tar.bz2
[Blimp] Rename CONTROL proto type to TAB_CONTROL.
Review URL: https://codereview.chromium.org/1530133006 Cr-Commit-Position: refs/heads/master@{#365889}
Diffstat (limited to 'blimp/net')
-rw-r--r--blimp/net/blimp_connection_unittest.cc2
-rw-r--r--blimp/net/blimp_message_pump_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/blimp/net/blimp_connection_unittest.cc b/blimp/net/blimp_connection_unittest.cc
index 759b426..8816b14 100644
--- a/blimp/net/blimp_connection_unittest.cc
+++ b/blimp/net/blimp_connection_unittest.cc
@@ -49,7 +49,7 @@ class BlimpConnectionTest : public testing::Test {
scoped_ptr<BlimpMessage> CreateControlMessage() {
scoped_ptr<BlimpMessage> msg(new BlimpMessage);
- msg->set_type(BlimpMessage::CONTROL);
+ msg->set_type(BlimpMessage::TAB_CONTROL);
return msg;
}
diff --git a/blimp/net/blimp_message_pump_unittest.cc b/blimp/net/blimp_message_pump_unittest.cc
index 14b08c7..aede128 100644
--- a/blimp/net/blimp_message_pump_unittest.cc
+++ b/blimp/net/blimp_message_pump_unittest.cc
@@ -33,7 +33,7 @@ class BlimpMessagePumpTest : public testing::Test {
BlimpMessagePumpTest()
: message1_(new BlimpMessage), message2_(new BlimpMessage) {
message1_->set_type(BlimpMessage::INPUT);
- message2_->set_type(BlimpMessage::CONTROL);
+ message2_->set_type(BlimpMessage::TAB_CONTROL);
message_pump_.reset(new BlimpMessagePump(&reader_));
message_pump_->set_error_observer(&error_observer_);
}