Convert MediaRouter mojom apis to intake url::Origin objects instead of strings

chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "chrome/browser/media/router/media_sinks_observer.h"
 #include "chrome/browser/media/router/media_source_helper.h"
 #include "chrome/browser/media/router/mock_media_router.h"
 #include "chrome/browser/ui/webui/media_router/query_result_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using testing::Eq;
 using testing::IsEmpty;
 using testing::Eq;
 using testing::Mock;
 using testing::Return;
 using testing::_;
 
 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:
   MOCK_METHOD1(OnResultsUpdated, void(
                    const std::vector<MediaSinkWithCastModes>& sinks));
 };
 
 }  // namespace
 
 class QueryResultManagerTest : public ::testing::Test {
  public:
   QueryResultManagerTest()
       : mock_router_(), query_result_manager_(&mock_router_) {
   }
 
   void DiscoverSinks(MediaCastMode cast_mode, const MediaSource& source) {
     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,
                               const MediaSink& sink) {
     return IsPreferredSourceForSink(MediaCastMode::DEFAULT, source, sink);
   }
 
   bool IsTabSourceForSink(const MediaSource* source, const MediaSink& sink) {
     return IsPreferredSourceForSink(MediaCastMode::TAB_MIRROR, source, sink);
   }
@@ skipping 40 matching lines @@
 
   query_result_manager_.RemoveObserver(&ob2);
   EXPECT_CALL(ob1, OnResultsUpdated(_)).Times(1);
   query_result_manager_.NotifyOnResultsUpdated();
 
   query_result_manager_.RemoveObserver(&ob1);
   query_result_manager_.NotifyOnResultsUpdated();
 }
 
 TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
-  GURL origin(kOrigin);
   CastModeSet cast_modes = query_result_manager_.GetSupportedCastModes();
   EXPECT_TRUE(cast_modes.empty());
   std::vector<MediaSource> actual_sources =
       query_result_manager_.GetSourcesForCastMode(MediaCastMode::DEFAULT);
   EXPECT_EQ(0u, actual_sources.size());
 
   MediaSource source(MediaSourceForPresentationUrl(GURL("http://foo.com")));
   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());
   EXPECT_TRUE(base::ContainsKey(cast_modes, MediaCastMode::DEFAULT));
   actual_sources =
       query_result_manager_.GetSourcesForCastMode(MediaCastMode::DEFAULT);
   EXPECT_EQ(1u, actual_sources.size());
   EXPECT_EQ(source, actual_sources[0]);
 
   // Register a different set of sources for the same cast mode.
   MediaSource another_source(
       MediaSourceForPresentationUrl(GURL("http://bar.com")));
   EXPECT_CALL(mock_router_, UnregisterMediaSinksObserver(_)).Times(1);
   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());
   EXPECT_TRUE(base::ContainsKey(cast_modes, MediaCastMode::DEFAULT));
   actual_sources =
       query_result_manager_.GetSourcesForCastMode(MediaCastMode::DEFAULT);
   EXPECT_EQ(1u, actual_sources.size());
   EXPECT_EQ(another_source, actual_sources[0]);
 
   EXPECT_CALL(mock_router_, UnregisterMediaSinksObserver(_)).Times(1);
@@ skipping 10 matching lines @@
   MediaSink sink1("sinkId1", "Sink 1", MediaSink::IconType::CAST);
   MediaSink sink2("sinkId2", "Sink 2", MediaSink::IconType::CAST);
   MediaSink sink3("sinkId3", "Sink 3", MediaSink::IconType::CAST);
   MediaSink sink4("sinkId4", "Sink 4", MediaSink::IconType::CAST);
   MediaSink sink5("sinkId5", "Sink 5", MediaSink::IconType::CAST);
   MediaSource default_source1 =
       MediaSourceForPresentationUrl(GURL("http://bar.com"));
   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);
   DiscoverSinks(MediaCastMode::TAB_MIRROR, tab_source);
 
   // Scenario (results in this order):
   // Action: DEFAULT -> [1, 2, 3]
   // Expected result:
   // Sinks: [1 -> {DEFAULT}, 2 -> {DEFAULT}, 3 -> {DEFAULT}]
   std::vector<MediaSinkWithCastModes> expected_sinks;
   expected_sinks.push_back(MediaSinkWithCastModes(sink1));
   expected_sinks.back().cast_modes.insert(MediaCastMode::DEFAULT);
   expected_sinks.push_back(MediaSinkWithCastModes(sink2));
   expected_sinks.back().cast_modes.insert(MediaCastMode::DEFAULT);
   expected_sinks.push_back(MediaSinkWithCastModes(sink3));
   expected_sinks.back().cast_modes.insert(MediaCastMode::DEFAULT);
 
   const auto& sinks_observers = query_result_manager_.sinks_observers_;
   auto sinks_observer_it = sinks_observers.find(default_source1);
   ASSERT_TRUE(sinks_observer_it != sinks_observers.end());
   ASSERT_TRUE(sinks_observer_it->second.get());
 
   std::vector<MediaSink> sinks_query_result;
   sinks_query_result.push_back(sink1);
   sinks_query_result.push_back(sink2);
   sinks_query_result.push_back(sink3);
   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:
   // Sinks: [1 -> {DEFAULT}, 2 -> {DEFAULT, TAB_MIRROR},
   //         3 -> {DEFAULT, TAB_MIRROR}, 4 -> {TAB_MIRROR}]
   expected_sinks.clear();
   expected_sinks.push_back(MediaSinkWithCastModes(sink1));
   expected_sinks.back().cast_modes.insert(MediaCastMode::DEFAULT);
   expected_sinks.push_back(MediaSinkWithCastModes(sink2));
   expected_sinks.back().cast_modes.insert(MediaCastMode::DEFAULT);
   expected_sinks.back().cast_modes.insert(MediaCastMode::TAB_MIRROR);
   expected_sinks.push_back(MediaSinkWithCastModes(sink3));
   expected_sinks.back().cast_modes.insert(MediaCastMode::DEFAULT);
   expected_sinks.back().cast_modes.insert(MediaCastMode::TAB_MIRROR);
   expected_sinks.push_back(MediaSinkWithCastModes(sink4));
   expected_sinks.back().cast_modes.insert(MediaCastMode::TAB_MIRROR);
 
   sinks_query_result.clear();
   sinks_query_result.push_back(sink2);
   sinks_query_result.push_back(sink3);
   sinks_query_result.push_back(sink4);
 
   sinks_observer_it = sinks_observers.find(tab_source);
   ASSERT_TRUE(sinks_observer_it != sinks_observers.end());
   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:
   // Sinks: [2 -> {TAB_MIRROR}, 3 -> {TAB_MIRROR}, 4 -> {TAB_MIRROR}]
   expected_sinks.clear();
   expected_sinks.push_back(MediaSinkWithCastModes(sink2));
   expected_sinks.back().cast_modes.insert(MediaCastMode::TAB_MIRROR);
   expected_sinks.push_back(MediaSinkWithCastModes(sink3));
   expected_sinks.back().cast_modes.insert(MediaCastMode::TAB_MIRROR);
   expected_sinks.push_back(MediaSinkWithCastModes(sink4));
   expected_sinks.back().cast_modes.insert(MediaCastMode::TAB_MIRROR);
 
   // The observer for the old source will be unregistered.
   EXPECT_CALL(mock_router_, UnregisterMediaSinksObserver(_)).Times(1);
   // The observer for the new source will be registered.
   EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
       .WillOnce(Return(true));
   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}]
   // (No change)
   sinks_query_result.clear();
   sinks_query_result.push_back(sink1);
   sinks_observer_it = sinks_observers.find(default_source2);
   ASSERT_TRUE(sinks_observer_it != sinks_observers.end());
   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("https://differentOrigin.com")});
+      sinks_query_result, {url::Origin(GURL("https://differentOrigin.com"))});
 
   // Action: Remove TAB_MIRROR observer
   // Expected result:
   // Sinks: []
   expected_sinks.clear();
   EXPECT_CALL(mock_observer_,
               OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
   EXPECT_CALL(mock_router_, UnregisterMediaSinksObserver(_)).Times(1);
   query_result_manager_.RemoveSourcesForCastMode(MediaCastMode::TAB_MIRROR);
 
@@ skipping 10 matching lines @@
       MediaSourceForPresentationUrl(GURL("http://urlA.com")));
   const MediaSource source_b(
       MediaSourceForPresentationUrl(GURL("http://urlB.com")));
   const MediaSource source_c(
       MediaSourceForPresentationUrl(GURL("http://urlC.com")));
   const MediaSource source_tab(MediaSourceForTab(1));
   // The sources are in decreasing order of priority.
   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.
   EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
       .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]
   // Expected result:
   // Sinks: [1 -> {},
   //         2 -> {URL_B},
   //         3 -> {},
   //         4 -> {URL_B}]
   auto sinks_observer_it = sinks_observers.find(source_b);
   ASSERT_TRUE(sinks_observer_it != sinks_observers.end());
   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));
   EXPECT_TRUE(IsDefaultSourceForSink(&source_b, sink4));
 
   // Action: URL_C -> [1, 2, 3]
   // Expected result:
   // Sinks: [1 -> {URL_C},
   //         2 -> {URL_B, URL_C},
   //         3 -> {URL_C},
   //         4 -> {URL_B}]
   sinks_observer_it = sinks_observers.find(source_c);
   ASSERT_TRUE(sinks_observer_it != sinks_observers.end());
   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));
   EXPECT_TRUE(IsDefaultSourceForSink(&source_b, sink4));
 
   // Action: URL_A -> [2, 3, 4]
   // Expected result:
   // Sinks: [1 -> {URL_C},
   //         2 -> {URL_A, URL_B, URL_C},
   //         3 -> {URL_A, URL_C},
   //         4 -> {URL_A, URL_B}]
   sinks_observer_it = sinks_observers.find(source_a);
   ASSERT_TRUE(sinks_observer_it != sinks_observers.end());
   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));
   EXPECT_TRUE(IsDefaultSourceForSink(&source_a, sink4));
 
   // Action: TAB -> [1, 2]
   // Expected result:
   // Sinks: [1 -> {URL_C, TAB},
   //         2 -> {URL_A, URL_B, URL_C, TAB},
   //         3 -> {URL_A, URL_C},
   //         4 -> {URL_A, URL_B}]
   sinks_observer_it = sinks_observers.find(source_tab);
   ASSERT_TRUE(sinks_observer_it != sinks_observers.end());
   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));
   EXPECT_TRUE(IsDefaultSourceForSink(&source_a, sink4));
   EXPECT_TRUE(IsTabSourceForSink(&source_tab, sink1));
   EXPECT_TRUE(IsTabSourceForSink(&source_tab, sink2));
   EXPECT_TRUE(IsTabSourceForSink(nullptr, sink3));
   EXPECT_TRUE(IsTabSourceForSink(nullptr, sink4));
 
   // The observers for the four sources should get unregistered.
   EXPECT_CALL(mock_router_, UnregisterMediaSinksObserver(_)).Times(4);
   query_result_manager_.RemoveSourcesForCastMode(MediaCastMode::DEFAULT);
   query_result_manager_.RemoveSourcesForCastMode(MediaCastMode::TAB_MIRROR);
 }
 
 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);
   EXPECT_TRUE(base::ContainsKey(cast_mode_sources, MediaCastMode::DEFAULT));
   EXPECT_EQ(default_sources.size(), 1u);
   EXPECT_EQ(default_sources.at(0), source);
   EXPECT_FALSE(base::ContainsKey(cast_mode_sources, MediaCastMode::TAB_MIRROR));
 }
 
 }  // namespace media_router