components/net_log/chrome_net_log.h - Issue 1918083002: Convert //components/[f-n]* 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/net_log/chrome_net_log.h

Issue 1918083002: Convert //components/[f-n]* 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 | « components/navigation_interception/intercept_navigation_throttle_unittest.cc ('k') | components/net_log/chrome_net_log.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/net_log/chrome_net_log.h

diff --git a/components/net_log/chrome_net_log.h b/components/net_log/chrome_net_log.h

index eae245d45e43a6e883715e62d073c257213045eb..6c9bc5e60e8af07e77b4b5686ffb1aa04905b54c 100644

--- a/components/net_log/chrome_net_log.h

+++ b/components/net_log/chrome_net_log.h

@@ -5,11 +5,11 @@

#ifndef COMPONENTS_NET_LOG_CHROME_NET_LOG_H_

#define COMPONENTS_NET_LOG_CHROME_NET_LOG_H_

+#include <memory>

#include <string>

#include "base/command_line.h"

#include "base/macros.h"

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

#include "net/log/net_log.h"

namespace base {

@@ -49,9 +49,9 @@ class ChromeNetLog : public net::NetLog {

const std::string& channel_string);

private:

- scoped_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_;

- scoped_ptr<NetLogTempFile> net_log_temp_file_;

- scoped_ptr<net::TraceNetLogObserver> trace_net_log_observer_;

+ std::unique_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_;

+ std::unique_ptr<NetLogTempFile> net_log_temp_file_;

+ std::unique_ptr<net::TraceNetLogObserver> trace_net_log_observer_;

DISALLOW_COPY_AND_ASSIGN(ChromeNetLog);

};