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

Unified Diff: services/catalog/catalog.h

Issue 1910673002: Convert //services 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
« no previous file with comments | « no previous file | services/catalog/catalog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/catalog/catalog.h
diff --git a/services/catalog/catalog.h b/services/catalog/catalog.h
index a2b8164b90910833c015df470717a220672a25ee..fb105e2a832ee0f3c3bcc9f95f939d16b2ce1de3 100644
--- a/services/catalog/catalog.h
+++ b/services/catalog/catalog.h
@@ -6,10 +6,10 @@
#define SERVICES_CATALOG_CATALOG_H_
#include <map>
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/catalog/public/interfaces/catalog.mojom.h"
@@ -41,7 +41,7 @@ class Catalog : public shell::ShellClient,
public:
// |manifest_provider| may be null.
Catalog(base::TaskRunner* file_task_runner,
- scoped_ptr<Store> store,
+ std::unique_ptr<Store> store,
ManifestProvider* manifest_provider);
~Catalog() override;
@@ -64,14 +64,14 @@ class Catalog : public shell::ShellClient,
void SystemPackageDirScanned();
base::TaskRunner* const file_task_runner_;
- scoped_ptr<Store> store_;
+ std::unique_ptr<Store> store_;
shell::mojom::ShellClientPtr shell_client_;
- scoped_ptr<shell::ShellConnection> shell_connection_;
+ std::unique_ptr<shell::ShellConnection> shell_connection_;
- std::map<std::string, scoped_ptr<Instance>> instances_;
+ std::map<std::string, std::unique_ptr<Instance>> instances_;
- scoped_ptr<Reader> system_reader_;
+ std::unique_ptr<Reader> system_reader_;
EntryCache system_cache_;
bool loaded_ = false;
« no previous file with comments | « no previous file | services/catalog/catalog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698