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

Unified Diff: chrome/browser/extensions/api/file_handlers/mime_util.h

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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: chrome/browser/extensions/api/file_handlers/mime_util.h
diff --git a/chrome/browser/extensions/api/file_handlers/mime_util.h b/chrome/browser/extensions/api/file_handlers/mime_util.h
index 2f1e7c695e053f602c29e699245b227e60d1dead..e1926642135b09a82faf1e1bb444d54822e4d130 100644
--- a/chrome/browser/extensions/api/file_handlers/mime_util.h
+++ b/chrome/browser/extensions/api/file_handlers/mime_util.h
@@ -9,12 +9,12 @@
#include <stddef.h>
+#include <memory>
#include <string>
#include <vector>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
class Profile;
@@ -43,7 +43,7 @@ void GetMimeTypeForLocalPath(
// available, then an empty string is returned in the result vector.
class MimeTypeCollector {
public:
- typedef base::Callback<void(scoped_ptr<std::vector<std::string> >)>
+ typedef base::Callback<void(std::unique_ptr<std::vector<std::string>>)>
CompletionCallback;
explicit MimeTypeCollector(Profile* profile);
@@ -64,7 +64,7 @@ class MimeTypeCollector {
void OnMimeTypeCollected(size_t index, const std::string& mime_type);
Profile* profile_;
- scoped_ptr<std::vector<std::string> > result_;
+ std::unique_ptr<std::vector<std::string>> result_;
size_t left_;
CompletionCallback callback_;
base::WeakPtrFactory<MimeTypeCollector> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698