| Index: components/devtools_discovery/devtools_discovery_manager.cc
|
| diff --git a/components/devtools_discovery/devtools_discovery_manager.cc b/components/devtools_discovery/devtools_discovery_manager.cc
|
| index 752dec10c350f0e47417f47622a1a8a8ab6f2ded..aaa998cba3c19ee997824c7868ea8c2a9526cf12 100644
|
| --- a/components/devtools_discovery/devtools_discovery_manager.cc
|
| +++ b/components/devtools_discovery/devtools_discovery_manager.cc
|
| @@ -24,7 +24,7 @@ DevToolsDiscoveryManager::~DevToolsDiscoveryManager() {
|
| STLDeleteElements(&providers_);
|
| }
|
|
|
| -void DevToolsDiscoveryManager::AddProvider(scoped_ptr<Provider> provider) {
|
| +void DevToolsDiscoveryManager::AddProvider(std::unique_ptr<Provider> provider) {
|
| providers_.push_back(provider.release());
|
| }
|
|
|
| @@ -45,10 +45,10 @@ void DevToolsDiscoveryManager::SetCreateCallback(
|
| create_callback_ = callback;
|
| }
|
|
|
| -scoped_ptr<DevToolsTargetDescriptor>
|
| -DevToolsDiscoveryManager::CreateNew(const GURL& url) {
|
| +std::unique_ptr<DevToolsTargetDescriptor> DevToolsDiscoveryManager::CreateNew(
|
| + const GURL& url) {
|
| if (create_callback_.is_null())
|
| - return scoped_ptr<DevToolsTargetDescriptor>();
|
| + return nullptr;
|
| return create_callback_.Run(url);
|
| }
|
|
|
|
|