[Media Router] Handle multiple Presentation URLs when creating routes

chrome/browser/media/router/media_router_dialog_controller_unittest.cc

 // Copyright 2016 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 <memory>
+#include <vector>
 
 #include "chrome/browser/media/router/create_presentation_connection_request.h"
 #include "chrome/browser/media/router/media_router_dialog_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/features.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 43 matching lines @@
     dialog_controller_.reset();
     web_contents_delegate_.reset();
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   void RequestSuccess(const content::PresentationSessionInfo&,
                       const MediaRoute&) {}
   void RequestError(const content::PresentationError& error) {}
 
   std::unique_ptr<CreatePresentationConnectionRequest> GetRequest() {
-    return base::MakeUnique<CreatePresentationConnectionRequest>(
-        RenderFrameHostId(1, 2), GURL("http://example.com"),
-        GURL("http://google.com"),
-        base::Bind(&MediaRouterDialogControllerTest::RequestSuccess,
-                   base::Unretained(this)),
-        base::Bind(&MediaRouterDialogControllerTest::RequestError,
-                   base::Unretained(this)));
+    return std::unique_ptr<CreatePresentationConnectionRequest>(

[mark a. foltz, 2016/12/02 20:59:08]

I think base::MakeUnique is preferred for constructing new objects held as
unique_ptr.

[zhaobin, 2016/12/02 22:50:56]

Get compile error with base::MakeUnique. It seems that template is not working
correctly when we use std::vector as constructor parameter.

../../base/memory/ptr_util.h:69:49: note: candidate template ignored:
substitution failure [with T =
media_router::CreatePresentationConnectionRequest]: no type named 'Invalid' in
'base::internal::MakeUniqueResult<media_router::CreatePresentationConnectionRequest>'
typename internal::MakeUniqueResult<T>::Invalid MakeUnique(Args&&... args) =

+        new CreatePresentationConnectionRequest(
+            RenderFrameHostId(1, 2), {GURL("http://example.com")},

[mark a. foltz, 2016/12/02 20:59:08]

Can you pass multiple URLs here?

[zhaobin, 2016/12/02 22:50:56]

Done.

+            GURL("http://google.com"),
+            base::Bind(&MediaRouterDialogControllerTest::RequestSuccess,
+                       base::Unretained(this)),
+            base::Bind(&MediaRouterDialogControllerTest::RequestError,
+                       base::Unretained(this))));
   }
 
   std::unique_ptr<TestMediaRouterDialogController> dialog_controller_;
   std::unique_ptr<MockWebContentsDelegate> web_contents_delegate_;
 };
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
 // The non-Android implementation is tested in
 // MediaRouterDialogControllerImplTest.
 TEST_F(MediaRouterDialogControllerTest, CreateForWebContents) {
@@ skipping 28 matching lines @@
   EXPECT_TRUE(dialog_controller_->IsShowingMediaRouterDialog());
 
   // If a dialog is already shown, ShowMediaRouterDialogForPresentation() should
   // return false.
   EXPECT_CALL(*web_contents_delegate_, ActivateContents(web_contents()));
   EXPECT_FALSE(
       dialog_controller_->ShowMediaRouterDialogForPresentation(GetRequest()));
 }
 
 }  // namespace media_router