components/wifi/network_properties.h - Issue 1917673002: Convert //components/[u-z]* 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/wifi/network_properties.h

Issue 1917673002: Convert //components/[u-z]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« components/wifi/fake_wifi_service.cc ('K') | « components/wifi/fake_wifi_service.cc ('k') | components/wifi/network_properties.cc » ('j') | components/wifi_sync/network_state_helper_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/wifi/network_properties.h

diff --git a/components/wifi/network_properties.h b/components/wifi/network_properties.h

index 734137b33e4913e5cec6f5792204a5764528cce0..07bfe1dc1f6a4e7aca3c34b52208c7912bfc8d74 100644

--- a/components/wifi/network_properties.h

+++ b/components/wifi/network_properties.h

@@ -8,10 +8,10 @@

#include <stdint.h>

#include <list>

+#include <memory>

#include <set>

#include <string>

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

#include "base/values.h"

#include "components/wifi/wifi_export.h"

@@ -52,7 +52,7 @@ struct WIFI_EXPORT NetworkProperties {

Frequency frequency;

FrequencySet frequency_set;

- scoped_ptr<base::DictionaryValue> ToValue(bool network_list) const;

+ std::unique_ptr<base::DictionaryValue> ToValue(bool network_list) const;

// Updates only properties set in |value|.

bool UpdateFromValue(const base::DictionaryValue& value);

static std::string MacAddressAsString(const uint8_t mac_as_int[6]);