Chromium Code Reviews| Index: chrome/browser/media/router/route_request_result.cc |
| diff --git a/chrome/browser/media/router/route_request_result.cc b/chrome/browser/media/router/route_request_result.cc |
| index 7f6f22698b8efebff499d74671599df7637dd33b..4c50e409f48d2dbbfce982369a625826dbc9bd68 100644 |
| --- a/chrome/browser/media/router/route_request_result.cc |
| +++ b/chrome/browser/media/router/route_request_result.cc |
| @@ -11,19 +11,19 @@ namespace media_router { |
| // static |
| std::unique_ptr<RouteRequestResult> RouteRequestResult::FromSuccess( |
| - std::unique_ptr<MediaRoute> route, |
| + const MediaRoute& route, |
| const std::string& presentation_id) { |
| - DCHECK(route); |
| - return base::WrapUnique(new RouteRequestResult( |
| - std::move(route), presentation_id, "", RouteRequestResult::OK)); |
| + return base::MakeUnique<RouteRequestResult>( |
| + base::MakeUnique<MediaRoute>(route), presentation_id, std::string(), |
|
mark a. foltz
2017/02/09 22:53:52
It's weird to take a const reference to a MediaRou
|
| + RouteRequestResult::OK); |
| } |
| // static |
| std::unique_ptr<RouteRequestResult> RouteRequestResult::FromError( |
| const std::string& error, |
| ResultCode result_code) { |
| - return base::WrapUnique( |
| - new RouteRequestResult(nullptr, "", error, result_code)); |
| + return base::MakeUnique<RouteRequestResult>(nullptr, std::string(), error, |
| + result_code); |
| } |
| RouteRequestResult::RouteRequestResult(std::unique_ptr<MediaRoute> route, |