components/sync_driver/sync_prefs.h - Issue 1907683003: Convert //components/sync_driver 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: components/sync_driver/sync_prefs.h

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

Patch Set: Build fix, address feedback 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

Index: components/sync_driver/sync_prefs.h

diff --git a/components/sync_driver/sync_prefs.h b/components/sync_driver/sync_prefs.h

index 7d52e867c3888e48f4545c91c7f4c16b9ca92c8e..6060a1cbfff0399183a75a36fff878c213ca7f62 100644

--- a/components/sync_driver/sync_prefs.h

+++ b/components/sync_driver/sync_prefs.h

@@ -8,11 +8,11 @@

#include <stdint.h>

#include <map>

+#include <memory>

#include <string>

#include "base/compiler_specific.h"

#include "base/macros.h"

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

#include "base/memory/weak_ptr.h"

#include "base/observer_list.h"

#include "base/threading/non_thread_safe.h"

@@ -179,7 +179,7 @@ class SyncPrefs : NON_EXPORTED_BASE(public base::NonThreadSafe),

// initialization after transition.

void SetSavedNigoriStateForPassphraseEncryptionTransition(

const syncer::SyncEncryptionHandler::NigoriState& nigori_state);

- scoped_ptr<syncer::SyncEncryptionHandler::NigoriState>

+ std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>

GetSavedNigoriStateForPassphraseEncryptionTransition() const;

private:

« no previous file with comments | « components/sync_driver/sync_api_component_factory_mock.cc ('k') | components/sync_driver/sync_prefs.cc » ('j') | no next file with comments »