sync/internal_api/sync_encryption_handler_impl.cc - Issue 1866243002: Convert //sync 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: sync/internal_api/sync_encryption_handler_impl.cc

Issue 1866243002: Convert //sync from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and fix conflicts 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:

Index: sync/internal_api/sync_encryption_handler_impl.cc

diff --git a/sync/internal_api/sync_encryption_handler_impl.cc b/sync/internal_api/sync_encryption_handler_impl.cc

index 7bd10b9704503a65893230d19d958cef0ab8d5fd..7345f92916440f193890f4040caf7423c1e1babe 100644

--- a/sync/internal_api/sync_encryption_handler_impl.cc

+++ b/sync/internal_api/sync_encryption_handler_impl.cc

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

#include <stddef.h>

#include <stdint.h>

+#include <memory>

#include <queue>

#include <string>

@@ -177,7 +178,7 @@ bool UnpackKeystoreBootstrapToken(

}

JSONStringValueDeserializer json(decrypted_keystore_bootstrap);

- scoped_ptr<base::Value> deserialized_keystore_keys(

+ std::unique_ptr<base::Value> deserialized_keystore_keys(

json.Deserialize(NULL, NULL));

if (!deserialized_keystore_keys)

return false;