components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h - Issue 1873263002: Convert //components/data_reduction_proxy 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/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h

Issue 1873263002: Convert //components/data_reduction_proxy 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

« components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc ('K') | « components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc » ('j') | components/data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h

index bf2944f34951b86e22071942d737f9550a579b35..04b7f81ba512fd4d5aab21223b4f82ec22d54169 100644

--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h

+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h

@@ -6,9 +6,9 @@

#define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_SETTINGS_TEST_UTILS_H_

#include <map>

+#include <memory>

#include <string>

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

#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"

#include "components/prefs/testing_pref_service.h"

#include "net/log/test_net_log.h"

@@ -79,8 +79,8 @@ class DataReductionProxySettingsTestBase : public testing::Test {

}

base::MessageLoopForIO message_loop_;

- scoped_ptr<DataReductionProxyTestContext> test_context_;

- scoped_ptr<DataReductionProxySettings> settings_;

+ std::unique_ptr<DataReductionProxyTestContext> test_context_;

+ std::unique_ptr<DataReductionProxySettings> settings_;

base::Time last_update_time_;

std::map<std::string, std::string> synthetic_field_trials_;

};