| Index: chrome/browser/ui/webui/media_router/media_router_ui.cc
|
| diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.cc b/chrome/browser/ui/webui/media_router/media_router_ui.cc
|
| index 21b89579851141259b91e9229038e018f6da57d2..a962fc1969ca5eb668a3212465655f28650e58c0 100644
|
| --- a/chrome/browser/ui/webui/media_router/media_router_ui.cc
|
| +++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc
|
| @@ -170,7 +170,7 @@ MediaRouterUI::MediaRouterUI(content::WebUI* web_ui)
|
| weak_factory_(this) {
|
| // Create a WebUIDataSource containing the chrome://media-router page's
|
| // content.
|
| - scoped_ptr<content::WebUIDataSource> html_source(
|
| + std::unique_ptr<content::WebUIDataSource> html_source(
|
| content::WebUIDataSource::Create(chrome::kChromeUIMediaRouterHost));
|
|
|
| content::WebContents* wc = web_ui->GetWebContents();
|
| @@ -232,7 +232,8 @@ void MediaRouterUI::InitWithDefaultMediaSource(
|
| void MediaRouterUI::InitWithPresentationSessionRequest(
|
| content::WebContents* initiator,
|
| const base::WeakPtr<PresentationServiceDelegateImpl>& delegate,
|
| - scoped_ptr<CreatePresentationConnectionRequest> create_session_request) {
|
| + std::unique_ptr<CreatePresentationConnectionRequest>
|
| + create_session_request) {
|
| DCHECK(initiator);
|
| DCHECK(create_session_request);
|
| DCHECK(!create_session_request_);
|
|
|