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

Unified Diff: content/zygote/zygote_linux.h

Issue 2647273002: Remove ScopedVector from content::ZygoteMain() (Closed)
Patch Set: Created 3 years, 11 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 | « content/public/app/content_main_delegate.cc ('k') | content/zygote/zygote_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/zygote/zygote_linux.h
diff --git a/content/zygote/zygote_linux.h b/content/zygote/zygote_linux.h
index af2c1005af3f550c11fc86e74b21ab7affcb0f3d..79a06eb220c7151a7fd5668b2e8fe31657720be8 100644
--- a/content/zygote/zygote_linux.h
+++ b/content/zygote/zygote_linux.h
@@ -7,12 +7,12 @@
#include <stddef.h>
+#include <memory>
#include <string>
#include <vector>
#include "base/containers/small_map.h"
#include "base/files/scoped_file.h"
-#include "base/memory/scoped_vector.h"
#include "base/posix/global_descriptors.h"
#include "base/process/kill.h"
#include "base/process/process.h"
@@ -32,7 +32,8 @@ class ZygoteForkDelegate;
// runs it.
class Zygote {
public:
- Zygote(int sandbox_flags, ScopedVector<ZygoteForkDelegate> helpers,
+ Zygote(int sandbox_flags,
+ std::vector<std::unique_ptr<ZygoteForkDelegate>> helpers,
const std::vector<base::ProcessHandle>& extra_children,
const std::vector<int>& extra_fds);
~Zygote();
@@ -135,7 +136,7 @@ class Zygote {
ZygoteProcessMap process_info_map_;
const int sandbox_flags_;
- ScopedVector<ZygoteForkDelegate> helpers_;
+ std::vector<std::unique_ptr<ZygoteForkDelegate>> helpers_;
// Count of how many fork delegates for which we've invoked InitialUMA().
size_t initial_uma_index_;
« no previous file with comments | « content/public/app/content_main_delegate.cc ('k') | content/zygote/zygote_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698