Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(532)

Unified Diff: chrome/browser/media/router/route_request_result.cc

Issue 2666873006: [Media Router] Convert to use typemaps for media_router.mojom. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..57cb225321570c1c343596c46a1996597aff53ac 100644
--- a/chrome/browser/media/router/route_request_result.cc
+++ b/chrome/browser/media/router/route_request_result.cc
@@ -11,19 +11,18 @@ 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, "",
dcheng 2017/02/01 22:51:08 It feels weird that we pass this by unique_ptr: sh
imcheng 2017/02/02 21:20:37 I wanted FromSuccess and FromError to invoke the s
+ 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, "", error, result_code);
dcheng 2017/02/01 22:51:08 Nit: "" should be std::string() here and above.
imcheng 2017/02/02 21:20:37 Done.
}
RouteRequestResult::RouteRequestResult(std::unique_ptr<MediaRoute> route,

Powered by Google App Engine
This is Rietveld 408576698