components/sync_driver/device_info_tracker.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/device_info_tracker.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

« no previous file with comments | « components/sync_driver/device_info_sync_service_unittest.cc ('k') | components/sync_driver/fake_generic_change_processor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_driver/device_info_tracker.h

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

index f506330fae85323287ab3f30deabd6348ae178b1..f9e4b54c9804965a29e24f32be690086fe39cfd4 100644

--- a/components/sync_driver/device_info_tracker.h

+++ b/components/sync_driver/device_info_tracker.h

@@ -5,9 +5,9 @@

#ifndef COMPONENTS_SYNC_DRIVER_DEVICE_INFO_TRACKER_H_

#define COMPONENTS_SYNC_DRIVER_DEVICE_INFO_TRACKER_H_

+#include <memory>

#include <string>

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

#include "base/memory/scoped_vector.h"

#include "components/sync_driver/device_info.h"

@@ -29,7 +29,7 @@ class DeviceInfoTracker {

// Gets DeviceInfo the synced device with specified client ID.

// Returns an empty scoped_ptr if device with the given |client_id| hasn't

// been synced.

- virtual scoped_ptr<DeviceInfo> GetDeviceInfo(

+ virtual std::unique_ptr<DeviceInfo> GetDeviceInfo(

const std::string& client_id) const = 0;

// Gets DeviceInfo for all synced devices (including the local one).

virtual ScopedVector<DeviceInfo> GetAllDeviceInfo() const = 0;