content/browser/device_sensors/data_fetcher_shared_memory_base.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/device_sensors/data_fetcher_shared_memory_base.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/device_sensors/data_fetcher_shared_memory_base.h ('k') | content/browser/device_sensors/device_inertial_sensor_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/device_sensors/data_fetcher_shared_memory_base.cc

diff --git a/content/browser/device_sensors/data_fetcher_shared_memory_base.cc b/content/browser/device_sensors/data_fetcher_shared_memory_base.cc

index be3780ea39e0c9e58212b0bc31c0619fb35c9bc3..2689b60e306826fe22defecb94cd254d1d4cd9f1 100644

--- a/content/browser/device_sensors/data_fetcher_shared_memory_base.cc

+++ b/content/browser/device_sensors/data_fetcher_shared_memory_base.cc

@@ -56,7 +56,7 @@ class DataFetcherSharedMemoryBase::PollingThread : public base::Thread {

unsigned consumers_bitmask_;

DataFetcherSharedMemoryBase* fetcher_;

- scoped_ptr<base::RepeatingTimer> timer_;

+ std::unique_ptr<base::RepeatingTimer> timer_;

DISALLOW_COPY_AND_ASSIGN(PollingThread);

};

@@ -226,7 +226,7 @@ base::SharedMemory* DataFetcherSharedMemoryBase::GetSharedMemory(

if (buffer_size == 0)

return nullptr;

- scoped_ptr<base::SharedMemory> new_shared_mem(new base::SharedMemory);

+ std::unique_ptr<base::SharedMemory> new_shared_mem(new base::SharedMemory);

if (new_shared_mem->CreateAndMapAnonymous(buffer_size)) {

if (void* mem = new_shared_mem->memory()) {

memset(mem, 0, buffer_size);