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

Unified Diff: chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc

Issue 2947403004: [MediaRouter] Replace RouteMessage with PresentationConnectionMessage (Closed)
Patch Set: Addressed Takumi's comments Created 3 years, 6 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
Index: chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc b/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc
index dec8aba235c451ed797608b6cab19b7bd42680ec..6851f364ce86501a02218791be825b445a6293cc 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc
@@ -26,7 +26,6 @@
#include "chrome/common/media_router/issue.h"
#include "chrome/common/media_router/media_route.h"
#include "chrome/common/media_router/media_source_helper.h"
-#include "chrome/common/media_router/route_message.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
@@ -1001,24 +1000,19 @@ namespace {
// Used in the RouteMessages* tests to populate the messages that will be
// processed and dispatched to RouteMessageObservers.
-void PopulateRouteMessages(std::vector<RouteMessage>* batch1,
- std::vector<RouteMessage>* batch2,
- std::vector<RouteMessage>* batch3) {
+void PopulateRouteMessages(
+ std::vector<content::PresentationConnectionMessage>* batch1,
+ std::vector<content::PresentationConnectionMessage>* batch2,
+ std::vector<content::PresentationConnectionMessage>* batch3) {
batch1->resize(1);
mark a. foltz 2017/06/28 07:29:55 I would slightly prefer to use the PCM constructor
imcheng 2017/06/29 08:21:09 Done.
- batch1->at(0).type = RouteMessage::TEXT;
- batch1->at(0).text = std::string("text1");
+ batch1->at(0).message = std::string("text1");
batch2->resize(2);
- batch2->at(0).type = RouteMessage::BINARY;
- batch2->at(0).binary = std::vector<uint8_t>(1, UINT8_C(1));
- batch2->at(1).type = RouteMessage::TEXT;
- batch2->at(1).text = std::string("text2");
+ batch2->at(0).data = std::vector<uint8_t>(1, UINT8_C(1));
+ batch2->at(1).message = std::string("text2");
batch3->resize(3);
- batch3->at(0).type = RouteMessage::TEXT;
- batch3->at(0).text = std::string("text3");
- batch3->at(1).type = RouteMessage::BINARY;
- batch3->at(1).binary = std::vector<uint8_t>(1, UINT8_C(2));
- batch3->at(2).type = RouteMessage::BINARY;
- batch3->at(2).binary = std::vector<uint8_t>(1, UINT8_C(3));
+ batch3->at(0).message = std::string("text3");
+ batch3->at(1).data = std::vector<uint8_t>(1, UINT8_C(2));
+ batch3->at(2).data = std::vector<uint8_t>(1, UINT8_C(3));
}
// Used in the RouteMessages* tests to observe and sanity-check that the
@@ -1036,36 +1030,31 @@ class ExpectedMessagesObserver : public RouteMessageObserver {
private:
void OnMessagesReceived(
- const std::vector<RouteMessage>& messages) final {
+ const std::vector<content::PresentationConnectionMessage>& messages)
+ final {
messages_.insert(messages_.end(), messages.begin(), messages.end());
mark a. foltz 2017/06/28 07:29:55 messages_ = messages?
imcheng 2017/06/29 08:21:09 This appends the contents of |messages| to |messag
}
void CheckReceivedMessages() {
ASSERT_EQ(6u, messages_.size());
- EXPECT_EQ(RouteMessage::TEXT, messages_[0].type);
- ASSERT_TRUE(messages_[0].text);
- EXPECT_EQ("text1", *messages_[0].text);
- EXPECT_EQ(RouteMessage::BINARY, messages_[1].type);
- ASSERT_TRUE(messages_[1].binary);
- ASSERT_EQ(1u, messages_[1].binary->size());
- EXPECT_EQ(UINT8_C(1), messages_[1].binary->front());
- EXPECT_EQ(RouteMessage::TEXT, messages_[2].type);
- ASSERT_TRUE(messages_[2].text);
- EXPECT_EQ("text2", *messages_[2].text);
- EXPECT_EQ(RouteMessage::TEXT, messages_[3].type);
- ASSERT_TRUE(messages_[3].text);
- EXPECT_EQ("text3", *messages_[3].text);
- EXPECT_EQ(RouteMessage::BINARY, messages_[4].type);
- ASSERT_TRUE(messages_[4].binary);
- ASSERT_EQ(1u, messages_[4].binary->size());
- EXPECT_EQ(UINT8_C(2), messages_[4].binary->front());
- EXPECT_EQ(RouteMessage::BINARY, messages_[5].type);
- ASSERT_TRUE(messages_[5].binary);
- ASSERT_EQ(1u, messages_[5].binary->size());
- EXPECT_EQ(UINT8_C(3), messages_[5].binary->front());
+ ASSERT_TRUE(messages_[0].message);
mark a. foltz 2017/06/28 07:29:55 PCM implements == so you could store the messages
imcheng 2017/06/29 08:21:09 Done. Though I find that the problem with assertin
mark a. foltz 2017/06/29 17:38:57 Yeah. It would be nice if there were an ASSERT_CO
+ EXPECT_EQ("text1", *messages_[0].message);
+ ASSERT_TRUE(messages_[1].data);
+ ASSERT_EQ(1u, messages_[1].data->size());
+ EXPECT_EQ(UINT8_C(1), messages_[1].data->front());
+ ASSERT_TRUE(messages_[2].message);
+ EXPECT_EQ("text2", *messages_[2].message);
+ ASSERT_TRUE(messages_[3].message);
+ EXPECT_EQ("text3", *messages_[3].message);
+ ASSERT_TRUE(messages_[4].data);
+ ASSERT_EQ(1u, messages_[4].data->size());
+ EXPECT_EQ(UINT8_C(2), messages_[4].data->front());
+ ASSERT_TRUE(messages_[5].data);
+ ASSERT_EQ(1u, messages_[5].data->size());
+ EXPECT_EQ(UINT8_C(3), messages_[5].data->front());
}
- std::vector<RouteMessage> messages_;
+ std::vector<content::PresentationConnectionMessage> messages_;
};
class NullMessageObserver : public RouteMessageObserver {
@@ -1074,13 +1063,16 @@ class NullMessageObserver : public RouteMessageObserver {
: RouteMessageObserver(router, route_id) {}
~NullMessageObserver() final {}
- void OnMessagesReceived(const std::vector<RouteMessage>& messages) final {}
+ void OnMessagesReceived(
+ const std::vector<content::PresentationConnectionMessage>& messages)
+ final {}
};
} // namespace
TEST_F(MediaRouterMojoImplTest, RouteMessagesSingleObserver) {
- std::vector<RouteMessage> incoming_batch1, incoming_batch2, incoming_batch3;
+ std::vector<content::PresentationConnectionMessage> incoming_batch1,
+ incoming_batch2, incoming_batch3;
PopulateRouteMessages(&incoming_batch1, &incoming_batch2, &incoming_batch3);
base::RunLoop run_loop;
@@ -1101,7 +1093,8 @@ TEST_F(MediaRouterMojoImplTest, RouteMessagesSingleObserver) {
}
TEST_F(MediaRouterMojoImplTest, RouteMessagesMultipleObservers) {
- std::vector<RouteMessage> incoming_batch1, incoming_batch2, incoming_batch3;
+ std::vector<content::PresentationConnectionMessage> incoming_batch1,
+ incoming_batch2, incoming_batch3;
PopulateRouteMessages(&incoming_batch1, &incoming_batch2, &incoming_batch3);
base::RunLoop run_loop;

Powered by Google App Engine
This is Rietveld 408576698