content/browser/geolocation/network_location_provider.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/geolocation/network_location_provider.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/geolocation/location_arbitrator_impl_unittest.cc ('k') | content/browser/geolocation/network_location_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/geolocation/network_location_provider.h

diff --git a/content/browser/geolocation/network_location_provider.h b/content/browser/geolocation/network_location_provider.h

index 6c37a8cb16ec9ff31022d54805988a9445b7f7b8..3381e522874c3c775e834e9de1f5d5f9833c9896 100644

--- a/content/browser/geolocation/network_location_provider.h

+++ b/content/browser/geolocation/network_location_provider.h

@@ -9,10 +9,10 @@

#include <list>

#include <map>

+#include <memory>

#include "base/macros.h"

#include "base/memory/ref_counted.h"

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

#include "base/memory/weak_ptr.h"

#include "base/strings/string16.h"

#include "base/threading/non_thread_safe.h"

@@ -124,10 +124,10 @@ class NetworkLocationProvider

bool is_new_data_available_;

// The network location request object, and the url it uses.

- scoped_ptr<NetworkLocationRequest> request_;

+ std::unique_ptr<NetworkLocationRequest> request_;

// The cache of positions.

- scoped_ptr<PositionCache> position_cache_;

+ std::unique_ptr<PositionCache> position_cache_;

base::WeakPtrFactory<NetworkLocationProvider> weak_factory_;