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

Unified Diff: components/devtools_discovery/devtools_discovery_manager.h

Issue 1921973002: Convert //components/[a-e]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 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: components/devtools_discovery/devtools_discovery_manager.h
diff --git a/components/devtools_discovery/devtools_discovery_manager.h b/components/devtools_discovery/devtools_discovery_manager.h
index f257f5467113e7993a24303563cda5e769a5b719..75657d46be6a32462680f60ab271d02da89ee56b 100644
--- a/components/devtools_discovery/devtools_discovery_manager.h
+++ b/components/devtools_discovery/devtools_discovery_manager.h
@@ -5,10 +5,10 @@
#ifndef COMPONENTS_DEVTOOLS_DISCOVERY_DEVTOOLS_DISCOVERY_MANAGER_H_
#define COMPONENTS_DEVTOOLS_DISCOVERY_DEVTOOLS_DISCOVERY_MANAGER_H_
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "components/devtools_discovery/devtools_target_descriptor.h"
@@ -24,19 +24,20 @@ class DevToolsDiscoveryManager {
virtual DevToolsTargetDescriptor::List GetDescriptors() = 0;
};
- using CreateCallback = base::Callback<
- scoped_ptr<DevToolsTargetDescriptor>(const GURL& url)>;
+ using CreateCallback =
+ base::Callback<std::unique_ptr<DevToolsTargetDescriptor>(
+ const GURL& url)>;
// Returns single instance of this class. The instance is destroyed on the
// browser main loop exit so this method MUST NOT be called after that point.
static DevToolsDiscoveryManager* GetInstance();
- void AddProvider(scoped_ptr<Provider> provider);
+ void AddProvider(std::unique_ptr<Provider> provider);
void SetCreateCallback(const CreateCallback& callback);
// Caller takes ownership of created descriptors.
DevToolsTargetDescriptor::List GetDescriptors();
- scoped_ptr<DevToolsTargetDescriptor> CreateNew(const GURL& url);
+ std::unique_ptr<DevToolsTargetDescriptor> CreateNew(const GURL& url);
private:
friend struct base::DefaultSingletonTraits<DevToolsDiscoveryManager>;

Powered by Google App Engine
This is Rietveld 408576698