content/browser/android/in_process_surface_texture_manager.cc - 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/in_process_surface_texture_manager.cc

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/android/in_process_surface_texture_manager.h ('k') | content/browser/android/java/gin_java_bridge_dispatcher_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/in_process_surface_texture_manager.cc

diff --git a/content/browser/android/in_process_surface_texture_manager.cc b/content/browser/android/in_process_surface_texture_manager.cc

index 23dc67c2e8ced942561f4bbde44c01daccd3706a..1b46c11cc83e4885779d48293c16f32a3318dd0f 100644

--- a/content/browser/android/in_process_surface_texture_manager.cc

+++ b/content/browser/android/in_process_surface_texture_manager.cc

@@ -10,6 +10,7 @@

#include "base/android/jni_android.h"

#include "base/containers/scoped_ptr_hash_map.h"

#include "base/logging.h"

+#include "base/memory/ptr_util.h"

#include "content/browser/media/android/browser_media_player_manager.h"

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

@@ -31,7 +32,7 @@ void InProcessSurfaceTextureManager::RegisterSurfaceTexture(

DCHECK(surface_textures_.find(surface_texture_id) == surface_textures_.end());

surface_textures_.add(

surface_texture_id,

- make_scoped_ptr(new gfx::ScopedJavaSurface(surface_texture)));

+ base::WrapUnique(new gfx::ScopedJavaSurface(surface_texture)));

}

void InProcessSurfaceTextureManager::UnregisterSurfaceTexture(