Index: extensions/browser/api/cast_channel/cast_framer_unittest.cc |
diff --git a/extensions/browser/api/cast_channel/cast_framer_unittest.cc b/extensions/browser/api/cast_channel/cast_framer_unittest.cc |
index 4000e1a7ab6f3f937d563c71f2757a074b843f0a..87c76e4eeec11e185bb459530b4286c07758bc88 100644 |
--- a/extensions/browser/api/cast_channel/cast_framer_unittest.cc |
+++ b/extensions/browser/api/cast_channel/cast_framer_unittest.cc |
@@ -15,6 +15,9 @@ |
namespace extensions { |
namespace api { |
namespace cast_channel { |
+ |
+using ::cast_channel::ChannelError; |
+ |
class CastFramerTest : public testing::Test { |
public: |
CastFramerTest() {} |
@@ -54,13 +57,13 @@ TEST_F(CastFramerTest, TestMessageFramerCompleteMessage) { |
// Receive 1 byte of the header, framer demands 3 more bytes. |
EXPECT_EQ(4u, framer_->BytesRequested()); |
EXPECT_EQ(nullptr, framer_->Ingest(1, &message_length, &error).get()); |
- EXPECT_EQ(cast_channel::CHANNEL_ERROR_NONE, error); |
+ EXPECT_EQ(ChannelError::NONE, error); |
EXPECT_EQ(3u, framer_->BytesRequested()); |
// Ingest remaining 3, expect that the framer has moved on to requesting the |
// body contents. |
EXPECT_EQ(nullptr, framer_->Ingest(3, &message_length, &error).get()); |
- EXPECT_EQ(cast_channel::CHANNEL_ERROR_NONE, error); |
+ EXPECT_EQ(ChannelError::NONE, error); |
EXPECT_EQ( |
cast_message_str_.size() - MessageFramer::MessageHeader::header_size(), |
framer_->BytesRequested()); |
@@ -69,7 +72,7 @@ TEST_F(CastFramerTest, TestMessageFramerCompleteMessage) { |
std::unique_ptr<CastMessage> message; |
message = framer_->Ingest(framer_->BytesRequested(), &message_length, &error); |
EXPECT_NE(static_cast<CastMessage*>(nullptr), message.get()); |
- EXPECT_EQ(cast_channel::CHANNEL_ERROR_NONE, error); |
+ EXPECT_EQ(ChannelError::NONE, error); |
EXPECT_EQ(message->SerializeAsString(), cast_message_.SerializeAsString()); |
EXPECT_EQ(4u, framer_->BytesRequested()); |
EXPECT_EQ(message->SerializeAsString().size(), message_length); |
@@ -97,14 +100,14 @@ TEST_F(CastFramerTest, TestIngestIllegalLargeMessage) { |
ChannelError error; |
EXPECT_EQ(4u, framer_->BytesRequested()); |
EXPECT_EQ(nullptr, framer_->Ingest(4, &bytes_ingested, &error).get()); |
- EXPECT_EQ(cast_channel::CHANNEL_ERROR_INVALID_MESSAGE, error); |
+ EXPECT_EQ(ChannelError::INVALID_MESSAGE, error); |
EXPECT_EQ(0u, framer_->BytesRequested()); |
// Test that the parser enters a terminal error state. |
WriteToBuffer(cast_message_str_); |
EXPECT_EQ(0u, framer_->BytesRequested()); |
EXPECT_EQ(nullptr, framer_->Ingest(4, &bytes_ingested, &error).get()); |
- EXPECT_EQ(cast_channel::CHANNEL_ERROR_INVALID_MESSAGE, error); |
+ EXPECT_EQ(ChannelError::INVALID_MESSAGE, error); |
EXPECT_EQ(0u, framer_->BytesRequested()); |
} |
@@ -126,14 +129,14 @@ TEST_F(CastFramerTest, TestUnparsableBodyProto) { |
ChannelError error; |
EXPECT_EQ(4u, framer_->BytesRequested()); |
EXPECT_EQ(nullptr, framer_->Ingest(4, &message_length, &error).get()); |
- EXPECT_EQ(cast_channel::CHANNEL_ERROR_NONE, error); |
+ EXPECT_EQ(ChannelError::NONE, error); |
EXPECT_EQ(cast_message_str_.size() - 4, framer_->BytesRequested()); |
// Send body, expect an error. |
std::unique_ptr<CastMessage> message; |
EXPECT_EQ(nullptr, framer_->Ingest(framer_->BytesRequested(), &message_length, |
&error).get()); |
- EXPECT_EQ(cast_channel::CHANNEL_ERROR_INVALID_MESSAGE, error); |
+ EXPECT_EQ(ChannelError::INVALID_MESSAGE, error); |
} |
} // namespace cast_channel |
} // namespace api |