| Index: chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
|
| diff --git a/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc b/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
|
| index 6d4aa38b187247581a20b18d37758dbd1cea107c..92dcf7b7ce92fe5a015a9f119ec202c90d835008 100644
|
| --- a/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
|
| +++ b/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
|
| @@ -4,8 +4,6 @@
|
|
|
| #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
|
|
|
| -#include <vector>
|
| -
|
| #include "base/memory/ptr_util.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "chrome/browser/media/router/media_source.h"
|
| @@ -87,9 +85,11 @@ class PresentationServiceDelegateImplTest
|
| auto callback = base::Bind(
|
| &PresentationServiceDelegateImplTest::OnDefaultPresentationStarted,
|
| base::Unretained(this));
|
| + std::vector<std::string> urls(1);
|
| std::string presentation_url1("http://foo.fakeUrl");
|
| - delegate_impl_->SetDefaultPresentationUrl(render_process_id, routing_id,
|
| - presentation_url1, callback);
|
| + urls[0] = presentation_url1;
|
| + delegate_impl_->SetDefaultPresentationUrls(render_process_id, routing_id,
|
| + urls, callback);
|
|
|
| ASSERT_TRUE(delegate_impl_->HasDefaultPresentationRequest());
|
| PresentationRequest request =
|
| @@ -277,8 +277,10 @@ TEST_F(PresentationServiceDelegateImplTest, SetDefaultPresentationUrl) {
|
| &PresentationServiceDelegateImplTest::OnDefaultPresentationStarted,
|
| base::Unretained(this));
|
| std::string presentation_url1("http://foo.fakeUrl");
|
| - delegate_impl_->SetDefaultPresentationUrl(render_process_id, routing_id,
|
| - presentation_url1, callback);
|
| + std::vector<std::string> urls(1);
|
| + urls[0] = presentation_url1;
|
| + delegate_impl_->SetDefaultPresentationUrls(render_process_id, routing_id,
|
| + urls, callback);
|
| ASSERT_TRUE(delegate_impl_->HasDefaultPresentationRequest());
|
| PresentationRequest request1 =
|
| delegate_impl_->GetDefaultPresentationRequest();
|
| @@ -289,8 +291,9 @@ TEST_F(PresentationServiceDelegateImplTest, SetDefaultPresentationUrl) {
|
|
|
| // Set to a new default presentation URL
|
| std::string presentation_url2("https://youtube.com");
|
| - delegate_impl_->SetDefaultPresentationUrl(render_process_id, routing_id,
|
| - presentation_url2, callback);
|
| + urls[0] = presentation_url2;
|
| + delegate_impl_->SetDefaultPresentationUrls(render_process_id, routing_id,
|
| + urls, callback);
|
| ASSERT_TRUE(delegate_impl_->HasDefaultPresentationRequest());
|
| PresentationRequest request2 =
|
| delegate_impl_->GetDefaultPresentationRequest();
|
| @@ -300,8 +303,8 @@ TEST_F(PresentationServiceDelegateImplTest, SetDefaultPresentationUrl) {
|
| EXPECT_EQ(frame_url, request2.frame_url());
|
|
|
| // Remove default presentation URL.
|
| - delegate_impl_->SetDefaultPresentationUrl(render_process_id, routing_id, "",
|
| - callback);
|
| + delegate_impl_->SetDefaultPresentationUrls(
|
| + render_process_id, routing_id, std::vector<std::string>(), callback);
|
| EXPECT_FALSE(delegate_impl_->HasDefaultPresentationRequest());
|
| }
|
|
|
| @@ -336,8 +339,10 @@ TEST_F(PresentationServiceDelegateImplTest,
|
| RenderFrameHostId(render_process_id, routing_id), url1, frame_url);
|
| EXPECT_CALL(observer, OnDefaultPresentationChanged(Equals(observed_request1)))
|
| .Times(1);
|
| - delegate_impl_->SetDefaultPresentationUrl(render_process_id, routing_id, url1,
|
| - callback);
|
| + std::vector<std::string> urls(1);
|
| + urls[0] = url1;
|
| + delegate_impl_->SetDefaultPresentationUrls(render_process_id, routing_id,
|
| + urls, callback);
|
|
|
| ASSERT_TRUE(delegate_impl_->HasDefaultPresentationRequest());
|
| PresentationRequest request1 =
|
| @@ -351,8 +356,9 @@ TEST_F(PresentationServiceDelegateImplTest,
|
| RenderFrameHostId(render_process_id, routing_id), url2, frame_url);
|
| EXPECT_CALL(observer, OnDefaultPresentationChanged(Equals(observed_request2)))
|
| .Times(1);
|
| - delegate_impl_->SetDefaultPresentationUrl(render_process_id, routing_id, url2,
|
| - callback);
|
| + urls[0] = url2;
|
| + delegate_impl_->SetDefaultPresentationUrls(render_process_id, routing_id,
|
| + urls, callback);
|
| ASSERT_TRUE(delegate_impl_->HasDefaultPresentationRequest());
|
| PresentationRequest request2 =
|
| delegate_impl_->GetDefaultPresentationRequest();
|
| @@ -362,8 +368,8 @@ TEST_F(PresentationServiceDelegateImplTest,
|
|
|
| // Remove default presentation URL.
|
| EXPECT_CALL(observer, OnDefaultPresentationRemoved()).Times(1);
|
| - delegate_impl_->SetDefaultPresentationUrl(render_process_id, routing_id, "",
|
| - callback);
|
| + delegate_impl_->SetDefaultPresentationUrls(
|
| + render_process_id, routing_id, std::vector<std::string>(), callback);
|
| }
|
|
|
| TEST_F(PresentationServiceDelegateImplTest, ListenForConnnectionStateChange) {
|
| @@ -382,9 +388,11 @@ TEST_F(PresentationServiceDelegateImplTest, ListenForConnnectionStateChange) {
|
|
|
| const std::string kPresentationUrl("http://url1.fakeUrl");
|
| const std::string kPresentationId("pid");
|
| + std::vector<std::string> urls(1);
|
| + urls[0] = kPresentationUrl;
|
| MockCreatePresentationConnnectionCallbacks mock_create_connection_callbacks;
|
| delegate_impl_->JoinSession(
|
| - render_process_id, routing_id, kPresentationUrl, kPresentationId,
|
| + render_process_id, routing_id, urls, kPresentationId,
|
| base::Bind(&MockCreatePresentationConnnectionCallbacks::
|
| OnCreateConnectionSuccess,
|
| base::Unretained(&mock_create_connection_callbacks)),
|
|
|