chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h - Issue 1899083002: Convert //chrome 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: chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h

Issue 1899083002: Convert //chrome 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 | « chrome/tools/mac_helpers/infoplist_strings_util.mm ('k') | chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h

diff --git a/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h b/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h

index bbb575d3848685de6cec475e1ed13c8980fde383..f6caf8476da5d4ffc97e84d2bf46c08573113af0 100644

--- a/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h

+++ b/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h

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

#define CHROME_TOOLS_SERVICE_DISCOVERY_SNIFFER_SERVICE_DISCOVERY_SNIFFER_H_

#include <map>

+#include <memory>

#include <string>

#include "base/macros.h"

@@ -31,7 +32,7 @@ class ServicePrinter {

const ServiceDescription& service);

bool changed_;

- scoped_ptr<ServiceResolver> service_resolver_;

+ std::unique_ptr<ServiceResolver> service_resolver_;

DISALLOW_COPY_AND_ASSIGN(ServicePrinter);

};

@@ -52,7 +53,7 @@ class ServiceTypePrinter {

typedef std::map<std::string, linked_ptr<ServicePrinter> > ServiceMap;

ServiceMap services_;

- scoped_ptr<ServiceWatcher> watcher_;

+ std::unique_ptr<ServiceWatcher> watcher_;

ServiceDiscoveryClient* client_;

DISALLOW_COPY_AND_ASSIGN(ServiceTypePrinter);