| Index: content/public/browser/content_browser_client.cc
|
| diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
|
| index 23fd868a00fc5e1316f999bb60e22572842881ae..41e23224d7a344fdaad616cbf1c1d15f8bb8c9af 100644
|
| --- a/content/public/browser/content_browser_client.cc
|
| +++ b/content/public/browser/content_browser_client.cc
|
| @@ -102,7 +102,7 @@ bool ContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation(
|
| return false;
|
| }
|
|
|
| -scoped_ptr<media::CdmFactory> ContentBrowserClient::CreateCdmFactory() {
|
| +std::unique_ptr<media::CdmFactory> ContentBrowserClient::CreateCdmFactory() {
|
| return nullptr;
|
| }
|
|
|
| @@ -220,17 +220,16 @@ QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() {
|
| return nullptr;
|
| }
|
|
|
| -scoped_ptr<storage::QuotaEvictionPolicy>
|
| +std::unique_ptr<storage::QuotaEvictionPolicy>
|
| ContentBrowserClient::GetTemporaryStorageEvictionPolicy(
|
| content::BrowserContext* context) {
|
| - return scoped_ptr<storage::QuotaEvictionPolicy>();
|
| + return std::unique_ptr<storage::QuotaEvictionPolicy>();
|
| }
|
|
|
| void ContentBrowserClient::SelectClientCertificate(
|
| WebContents* web_contents,
|
| net::SSLCertRequestInfo* cert_request_info,
|
| - scoped_ptr<ClientCertificateDelegate> delegate) {
|
| -}
|
| + std::unique_ptr<ClientCertificateDelegate> delegate) {}
|
|
|
| net::URLRequestContext* ContentBrowserClient::OverrideRequestContextForURL(
|
| const GURL& url, ResourceContext* context) {
|
|
|