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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc

Issue 2627463003: Convert MediaRouter mojom apis to intake url::Origin objects instead of strings (Closed)
Patch Set: Fix chromeos browser tests Created 3 years, 11 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
« chrome/browser/ui/webui/media_router/query_result_manager.h ('K') | « chrome/browser/ui/webui/media_router/query_result_manager.cc ('k') | chrome/test/media_router/media_router_e2e_browsertest.h » ('j') | chrome/test/media_router/media_router_e2e_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
diff --git a/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc b/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
index 8e019552ce810cca102c1b23653778d1c7e2c142..f67fc22913b8adb426d96abc00e7c21eefc1545d 100644
--- a/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
+++ b/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
@@ -26,7 +26,7 @@ namespace media_router {
namespace {
-const char kOrigin[] = "https://origin.com";
+const url::Origin kOrigin = url::Origin(GURL("https://origin.com"));
mark a. foltz 2017/01/17 21:30:45 Don't use complex ctors in statics
steimel 2017/01/18 01:52:35 Done.
class MockObserver : public QueryResultManager::Observer {
public:
@@ -46,8 +46,7 @@ class QueryResultManagerTest : public ::testing::Test {
EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
.WillOnce(Return(true));
EXPECT_CALL(mock_observer_, OnResultsUpdated(_)).Times(1);
- query_result_manager_.SetSourcesForCastMode(cast_mode, {source},
- GURL(kOrigin));
+ query_result_manager_.SetSourcesForCastMode(cast_mode, {source}, kOrigin);
}
bool IsDefaultSourceForSink(const MediaSource* source,
@@ -108,7 +107,6 @@ TEST_F(QueryResultManagerTest, Observers) {
}
TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
- GURL origin(kOrigin);
CastModeSet cast_modes = query_result_manager_.GetSupportedCastModes();
EXPECT_TRUE(cast_modes.empty());
std::vector<MediaSource> actual_sources =
@@ -119,7 +117,7 @@ TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
.WillOnce(Return(true));
query_result_manager_.SetSourcesForCastMode(MediaCastMode::DEFAULT, {source},
- origin);
+ kOrigin);
cast_modes = query_result_manager_.GetSupportedCastModes();
EXPECT_EQ(1u, cast_modes.size());
@@ -136,7 +134,7 @@ TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
.WillOnce(Return(true));
query_result_manager_.SetSourcesForCastMode(MediaCastMode::DEFAULT,
- {another_source}, origin);
+ {another_source}, kOrigin);
cast_modes = query_result_manager_.GetSupportedCastModes();
EXPECT_EQ(1u, cast_modes.size());
@@ -167,7 +165,6 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
MediaSource default_source2 =
MediaSourceForPresentationUrl(GURL("http://baz.com"));
MediaSource tab_source = MediaSourceForTab(123);
- GURL origin(kOrigin);
query_result_manager_.AddObserver(&mock_observer_);
DiscoverSinks(MediaCastMode::DEFAULT, default_source1);
@@ -197,7 +194,7 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
EXPECT_CALL(mock_observer_,
OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
sinks_observer_it->second->OnSinksUpdated(sinks_query_result,
- std::vector<GURL>());
+ std::vector<url::Origin>());
// Action: TAB_MIRROR -> [2, 3, 4]
// Expected result:
@@ -225,8 +222,7 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
ASSERT_TRUE(sinks_observer_it->second.get());
EXPECT_CALL(mock_observer_,
OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
- sinks_observer_it->second->OnSinksUpdated(sinks_query_result,
- {GURL(kOrigin)});
+ sinks_observer_it->second->OnSinksUpdated(sinks_query_result, {kOrigin});
// Action: Update default presentation URL
// Expected result:
@@ -247,7 +243,7 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
EXPECT_CALL(mock_observer_,
OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
query_result_manager_.SetSourcesForCastMode(MediaCastMode::DEFAULT,
- {default_source2}, origin);
+ {default_source2}, kOrigin);
// Action: DEFAULT -> [1], origins don't match
// Expected result: [2 -> {TAB_MIRROR}, 3 -> {TAB_MIRROR}, 4 -> {TAB_MIRROR}]
@@ -260,7 +256,7 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
EXPECT_CALL(mock_observer_, OnResultsUpdated(VectorEquals(expected_sinks)))
.Times(1);
sinks_observer_it->second->OnSinksUpdated(
- sinks_query_result, {GURL("https://differentOrigin.com")});
+ sinks_query_result, {url::Origin(GURL("https://differentOrigin.com"))});
// Action: Remove TAB_MIRROR observer
// Expected result:
@@ -291,7 +287,6 @@ TEST_F(QueryResultManagerTest, MultipleUrls) {
const std::vector<MediaSource> default_sources = {source_a, source_b,
source_c};
const std::vector<MediaSource> tab_sources = {source_tab};
- const GURL origin(kOrigin);
const auto& sinks_observers = query_result_manager_.sinks_observers_;
// There should be one MediaSinksObserver per source.
@@ -299,9 +294,9 @@ TEST_F(QueryResultManagerTest, MultipleUrls) {
.Times(4)
.WillRepeatedly(Return(true));
query_result_manager_.SetSourcesForCastMode(MediaCastMode::DEFAULT,
- default_sources, origin);
+ default_sources, kOrigin);
query_result_manager_.SetSourcesForCastMode(MediaCastMode::TAB_MIRROR,
- tab_sources, origin);
+ tab_sources, kOrigin);
// Scenario (results in this order):
// Action: URL_B -> [2, 4]
@@ -315,7 +310,7 @@ TEST_F(QueryResultManagerTest, MultipleUrls) {
ASSERT_TRUE(sinks_observer_it->second.get());
auto& source_b_observer = sinks_observer_it->second;
- source_b_observer->OnSinksUpdated({sink2, sink4}, std::vector<GURL>());
+ source_b_observer->OnSinksUpdated({sink2, sink4}, std::vector<url::Origin>());
EXPECT_TRUE(IsDefaultSourceForSink(nullptr, sink1));
EXPECT_TRUE(IsDefaultSourceForSink(&source_b, sink2));
EXPECT_TRUE(IsDefaultSourceForSink(nullptr, sink3));
@@ -332,7 +327,8 @@ TEST_F(QueryResultManagerTest, MultipleUrls) {
ASSERT_TRUE(sinks_observer_it->second.get());
auto& source_c_observer = sinks_observer_it->second;
- source_c_observer->OnSinksUpdated({sink1, sink2, sink3}, std::vector<GURL>());
+ source_c_observer->OnSinksUpdated({sink1, sink2, sink3},
+ std::vector<url::Origin>());
EXPECT_TRUE(IsDefaultSourceForSink(&source_c, sink1));
EXPECT_TRUE(IsDefaultSourceForSink(&source_b, sink2));
EXPECT_TRUE(IsDefaultSourceForSink(&source_c, sink3));
@@ -349,7 +345,8 @@ TEST_F(QueryResultManagerTest, MultipleUrls) {
ASSERT_TRUE(sinks_observer_it->second.get());
auto& source_a_observer = sinks_observer_it->second;
- source_a_observer->OnSinksUpdated({sink2, sink3, sink4}, std::vector<GURL>());
+ source_a_observer->OnSinksUpdated({sink2, sink3, sink4},
+ std::vector<url::Origin>());
EXPECT_TRUE(IsDefaultSourceForSink(&source_c, sink1));
EXPECT_TRUE(IsDefaultSourceForSink(&source_a, sink2));
EXPECT_TRUE(IsDefaultSourceForSink(&source_a, sink3));
@@ -366,7 +363,8 @@ TEST_F(QueryResultManagerTest, MultipleUrls) {
ASSERT_TRUE(sinks_observer_it->second.get());
auto& source_tab_observer = sinks_observer_it->second;
- source_tab_observer->OnSinksUpdated({sink1, sink2}, std::vector<GURL>());
+ source_tab_observer->OnSinksUpdated({sink1, sink2},
+ std::vector<url::Origin>());
EXPECT_TRUE(IsDefaultSourceForSink(&source_c, sink1));
EXPECT_TRUE(IsDefaultSourceForSink(&source_a, sink2));
EXPECT_TRUE(IsDefaultSourceForSink(&source_a, sink3));
@@ -385,17 +383,16 @@ TEST_F(QueryResultManagerTest, MultipleUrls) {
TEST_F(QueryResultManagerTest, AddInvalidSource) {
const MediaSource source(
MediaSourceForPresentationUrl(GURL("http://url.com")));
- const GURL origin(kOrigin);
EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
.Times(1)
.WillRepeatedly(Return(true));
query_result_manager_.SetSourcesForCastMode(MediaCastMode::DEFAULT, {source},
- origin);
+ kOrigin);
// |source| has already been registered with the default cast mode, so it
// shouldn't get registered with tab mirroring.
query_result_manager_.SetSourcesForCastMode(MediaCastMode::TAB_MIRROR,
- {source}, origin);
+ {source}, kOrigin);
const auto& cast_mode_sources = query_result_manager_.cast_mode_sources_;
const auto& default_sources = cast_mode_sources.at(MediaCastMode::DEFAULT);
« chrome/browser/ui/webui/media_router/query_result_manager.h ('K') | « chrome/browser/ui/webui/media_router/query_result_manager.cc ('k') | chrome/test/media_router/media_router_e2e_browsertest.h » ('j') | chrome/test/media_router/media_router_e2e_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698