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

Unified Diff: content/zygote/zygote_main_linux.cc

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent 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 | « content/utility/utility_thread_impl.h ('k') | extensions/shell/browser/shell_url_request_context_getter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/zygote/zygote_main_linux.cc
diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
index 43b2578692660d1766b960775c4110e969523c1e..8620eb98d11d320697deb94ac8d17a0e0026930c 100644
--- a/content/zygote/zygote_main_linux.cc
+++ b/content/zygote/zygote_main_linux.cc
@@ -16,13 +16,14 @@
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
+
+#include <memory>
#include <utility>
#include <vector>
#include "base/bind.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/native_library.h"
#include "base/pickle.h"
@@ -335,7 +336,7 @@ static void ZygotePreSandboxInit() {
// Olson timezone ID by accessing the zoneinfo files on disk. After
// TimeZone::createDefault is called once here, the timezone ID is
// cached and there's no more need to access the file system.
- scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
+ std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
#if defined(ARCH_CPU_ARM_FAMILY)
// On ARM, BoringSSL requires access to /proc/cpuinfo to determine processor
@@ -455,7 +456,7 @@ static int g_sanitizer_message_length = 1 * 1024 * 1024;
// A helper process which collects code coverage data from the renderers over a
// socket and dumps it to a file. See http://crbug.com/336212 for discussion.
static void SanitizerCoverageHelper(int socket_fd, int file_fd) {
- scoped_ptr<char[]> buffer(new char[g_sanitizer_message_length]);
+ std::unique_ptr<char[]> buffer(new char[g_sanitizer_message_length]);
while (true) {
ssize_t received_size = HANDLE_EINTR(
recv(socket_fd, buffer.get(), g_sanitizer_message_length, 0));
« no previous file with comments | « content/utility/utility_thread_impl.h ('k') | extensions/shell/browser/shell_url_request_context_getter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698