content/browser/android/child_process_launcher_android.h - Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/android/child_process_launcher_android.h

Issue 1874893002: Convert //content/browser 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 | « content/browser/accessibility/touch_accessibility_aura_browsertest.cc ('k') | content/browser/android/child_process_launcher_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/child_process_launcher_android.h

diff --git a/content/browser/android/child_process_launcher_android.h b/content/browser/android/child_process_launcher_android.h

index f81c5c33efcd434c55e7e8e0d942602f223dcde6..a8ea904c6f15167c1d8c8bce4c2cf6f1c870f801 100644

--- a/content/browser/android/child_process_launcher_android.h

+++ b/content/browser/android/child_process_launcher_android.h

@@ -8,11 +8,11 @@

#include <jni.h>

#include <map>

+#include <memory>

#include "base/callback.h"

#include "base/command_line.h"

#include "base/files/memory_mapped_file.h"

-#include "base/memory/scoped_ptr.h"

#include "base/process/process.h"

#include "content/public/browser/file_descriptor_info.h"

#include "ui/gl/android/scoped_java_surface.h"

@@ -27,7 +27,7 @@ typedef base::Callback<void(base::ProcessHandle)> StartChildProcessCallback;

void StartChildProcess(

const base::CommandLine::StringVector& argv,

int child_process_id,

- const scoped_ptr<FileDescriptorInfo> files_to_register,

+ const std::unique_ptr<FileDescriptorInfo> files_to_register,

const std::map<int, base::MemoryMappedFile::Region>& regions,

const StartChildProcessCallback& callback);