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 b8f6170303d72f4b073bce02438e359786573e2e..89641e1ce2126ff221f4747c1cabb31c92b6cefe 100644 |
--- a/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc |
+++ b/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc |
@@ -154,21 +154,20 @@ class PresentationServiceDelegateImplTest |
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
|
+ 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); |
} |
@@ -429,8 +428,8 @@ TEST_F(PresentationServiceDelegateImplTest, ListenForConnnectionStateChange) { |
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); |