[Media Router] Handle multiple Presentation URLs when creating routes

chrome/browser/media/router/media_router_dialog_controller_unittest.cc

Index: chrome/browser/media/router/media_router_dialog_controller_unittest.cc
diff --git a/chrome/browser/media/router/media_router_dialog_controller_unittest.cc b/chrome/browser/media/router/media_router_dialog_controller_unittest.cc
index a302d351a0d6c19d3859765633f47926b404e6f1..59d9c1bd94890b3b025f977efd5e0f5f420c3de7 100644
--- a/chrome/browser/media/router/media_router_dialog_controller_unittest.cc
+++ b/chrome/browser/media/router/media_router_dialog_controller_unittest.cc
@@ -3,6 +3,7 @@
 // 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"
@@ -66,13 +67,14 @@ class MediaRouterDialogControllerTest : public ChromeRenderViewHostTestHarness {
   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_;