[Media Router] Convert to use typemaps for media_router.mojom.

chrome/browser/media/router/presentation_service_delegate_impl_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 "chrome/browser/media/router/presentation_service_delegate_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/media/router/media_source.h"
 #include "chrome/browser/media/router/media_source_helper.h"
 #include "chrome/browser/media/router/mock_media_router.h"
@@ skipping 136 matching lines @@
     // Should not trigger callback since route response is error.
     std::unique_ptr<RouteRequestResult> result = RouteRequestResult::FromError(
         "Error", RouteRequestResult::UNKNOWN_ERROR);
     delegate_impl_->OnRouteResponse(request, *result);
     EXPECT_TRUE(Mock::VerifyAndClearExpectations(this));
 
     // Should not trigger callback since request doesn't match.
     PresentationRequest different_request(RenderFrameHostId(100, 200),
                                           {presentation_url2_},
                                           url::Origin(GURL(kFrameUrl)));
-    MediaRoute* media_route = new MediaRoute("differentRouteId", source2_,
-                                             "mediaSinkId", "", true, "", true);
-    media_route->set_incognito(incognito);
-    result = RouteRequestResult::FromSuccess(base::WrapUnique(media_route),
-                                             "differentPresentationId");
+    MediaRoute media_route("differentRouteId", source2_, "mediaSinkId", "",

[mark a. foltz, 2017/02/09 22:53:52]

Since the route description isn't represented by a base::Optional like the sink
description, the API suggests it's mandatory.  But it looks like we're allowing
an empty description.

Just noting a slight inconsistency in handling optional parameters.

+                           true, "", true);
+    media_route.set_incognito(incognito);
+    result =
+        RouteRequestResult::FromSuccess(media_route, "differentPresentationId");
     delegate_impl_->OnRouteResponse(different_request, *result);
     EXPECT_TRUE(Mock::VerifyAndClearExpectations(this));
 
     // Should trigger callback since request matches.
     EXPECT_CALL(*this, OnDefaultPresentationStarted(_)).Times(1);
-    MediaRoute* media_route2 =
-        new MediaRoute("routeId", source1_, "mediaSinkId", "", true, "", true);
-    media_route2->set_incognito(incognito);
-    result = RouteRequestResult::FromSuccess(base::WrapUnique(media_route2),
-                                             "presentationId");
+    MediaRoute media_route2("routeId", source1_, "mediaSinkId", "", true, "",
+                            true);
+    media_route2.set_incognito(incognito);
+    result = RouteRequestResult::FromSuccess(media_route2, "presentationId");
     delegate_impl_->OnRouteResponse(request, *result);
   }
 
   void SetMainFrame() {
     content::RenderFrameHost* main_frame = GetWebContents()->GetMainFrame();
     ASSERT_TRUE(main_frame);
     main_frame_process_id_ = main_frame->GetProcess()->GetID();
     main_frame_routing_id_ = main_frame->GetRoutingID();
   }
 
@@ skipping 240 matching lines @@
       base::Bind(&MockCreatePresentationConnnectionCallbacks::
                      OnCreateConnectionSuccess,
                  base::Unretained(&mock_create_connection_callbacks)),
       base::Bind(
           &MockCreatePresentationConnnectionCallbacks::OnCreateConnectionError,
           base::Unretained(&mock_create_connection_callbacks)));
 
   EXPECT_CALL(mock_create_connection_callbacks, OnCreateConnectionSuccess(_))
       .Times(1);
   std::unique_ptr<RouteRequestResult> result = RouteRequestResult::FromSuccess(
-      base::MakeUnique<MediaRoute>("routeId", source1_, "mediaSinkId",
-                                   "description", true, "", true),
+      MediaRoute("routeId", source1_, "mediaSinkId", "description", true, "",
+                 true),
       kPresentationId);
   for (const auto& route_response_callback : route_response_callbacks)
     route_response_callback.Run(*result);
 
   MockPresentationConnectionStateChangedCallback mock_callback;
   content::PresentationConnectionStateChangedCallback callback =
       base::Bind(&MockPresentationConnectionStateChangedCallback::Run,
                  base::Unretained(&mock_callback));
   content::PresentationSessionInfo connection(presentation_url1_,
                                               kPresentationId);
@@ skipping 173 matching lines @@
       base::Bind(&MockCreatePresentationConnnectionCallbacks::
                      OnCreateConnectionSuccess,
                  base::Unretained(&mock_create_connection_callbacks)),
       base::Bind(
           &MockCreatePresentationConnnectionCallbacks::OnCreateConnectionError,
           base::Unretained(&mock_create_connection_callbacks)));
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace media_router