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

Index: content/browser/geolocation/network_location_request.cc

diff --git a/content/browser/geolocation/network_location_request.cc b/content/browser/geolocation/network_location_request.cc

index 7471c17160eaade1f2a7d95d4bce8a3e836ea1fe..933ce5f7d038f830015726305f0dabb37d620045 100644

--- a/content/browser/geolocation/network_location_request.cc

+++ b/content/browser/geolocation/network_location_request.cc

@@ -360,8 +360,9 @@ bool ParseServerResponse(const std::string& response_body,

// Parse the response, ignoring comments.

std::string error_msg;

- scoped_ptr<base::Value> response_value = base::JSONReader::ReadAndReturnError(

- response_body, base::JSON_PARSE_RFC, NULL, &error_msg);

+ std::unique_ptr<base::Value> response_value =

+ base::JSONReader::ReadAndReturnError(response_body, base::JSON_PARSE_RFC,

+ NULL, &error_msg);

if (response_value == NULL) {

LOG(WARNING) << "ParseServerResponse() : JSONReader failed : "

<< error_msg;