Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1340)

Unified Diff: components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc

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
Index: components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc
diff --git a/components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc b/components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc
index 3e824e33d9d1a224a065a1168ea632b9dfd68b6a..21a9e6425323874a92d67895615782b2d9444fe2 100644
--- a/components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc
+++ b/components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc
@@ -75,7 +75,8 @@ class ContentLoFiDeciderTest : public testing::Test {
data_reduction_proxy_network_delegate_.reset(
new DataReductionProxyNetworkDelegate(
- scoped_ptr<net::NetworkDelegate>(new net::NetworkDelegateImpl()),
+ std::unique_ptr<net::NetworkDelegate>(
+ new net::NetworkDelegateImpl()),
test_context_->config(),
test_context_->io_data()->request_options(),
test_context_->configurator()));
@@ -85,15 +86,15 @@ class ContentLoFiDeciderTest : public testing::Test {
context_.set_network_delegate(data_reduction_proxy_network_delegate_.get());
- scoped_ptr<data_reduction_proxy::ContentLoFiDecider>
+ std::unique_ptr<data_reduction_proxy::ContentLoFiDecider>
data_reduction_proxy_lofi_decider(
new data_reduction_proxy::ContentLoFiDecider());
test_context_->io_data()->set_lofi_decider(
std::move(data_reduction_proxy_lofi_decider));
}
- scoped_ptr<net::URLRequest> CreateRequest(bool is_using_lofi) {
- scoped_ptr<net::URLRequest> request = context_.CreateRequest(
+ std::unique_ptr<net::URLRequest> CreateRequest(bool is_using_lofi) {
+ std::unique_ptr<net::URLRequest> request = context_.CreateRequest(
GURL("http://www.google.com/"), net::IDLE, &delegate_);
content::ResourceRequestInfo::AllocateForTesting(
@@ -162,8 +163,8 @@ class ContentLoFiDeciderTest : public testing::Test {
net::MockClientSocketFactory mock_socket_factory_;
net::TestURLRequestContext context_;
net::TestDelegate delegate_;
- scoped_ptr<DataReductionProxyTestContext> test_context_;
- scoped_ptr<DataReductionProxyNetworkDelegate>
+ std::unique_ptr<DataReductionProxyTestContext> test_context_;
+ std::unique_ptr<DataReductionProxyNetworkDelegate>
data_reduction_proxy_network_delegate_;
};
@@ -177,7 +178,8 @@ TEST_F(ContentLoFiDeciderTest, LoFiFlags) {
};
for (size_t i = 0; i < arraysize(tests); ++i) {
- scoped_ptr<net::URLRequest> request = CreateRequest(tests[i].is_using_lofi);
+ std::unique_ptr<net::URLRequest> request =
+ CreateRequest(tests[i].is_using_lofi);
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
command_line->InitFromArgv(command_line->argv());
if (tests[i].is_using_previews) {
@@ -255,7 +257,8 @@ TEST_F(ContentLoFiDeciderTest, LoFiEnabledFieldTrial) {
};
for (size_t i = 0; i < arraysize(tests); ++i) {
- scoped_ptr<net::URLRequest> request = CreateRequest(tests[i].is_using_lofi);
+ std::unique_ptr<net::URLRequest> request =
+ CreateRequest(tests[i].is_using_lofi);
net::HttpRequestHeaders headers;
NotifyBeforeSendProxyHeaders(&headers, request.get(), true);
VerifyLoFiHeader(tests[i].is_using_lofi, headers);
@@ -276,7 +279,8 @@ TEST_F(ContentLoFiDeciderTest, LoFiControlFieldTrial) {
};
for (size_t i = 0; i < arraysize(tests); ++i) {
- scoped_ptr<net::URLRequest> request = CreateRequest(tests[i].is_using_lofi);
+ std::unique_ptr<net::URLRequest> request =
+ CreateRequest(tests[i].is_using_lofi);
net::HttpRequestHeaders headers;
NotifyBeforeSendProxyHeaders(&headers, request.get(), true);
VerifyLoFiHeader(false, headers);
@@ -298,7 +302,8 @@ TEST_F(ContentLoFiDeciderTest, LoFiPreviewFieldTrial) {
};
for (size_t i = 0; i < arraysize(tests); ++i) {
- scoped_ptr<net::URLRequest> request = CreateRequest(tests[i].is_using_lofi);
+ std::unique_ptr<net::URLRequest> request =
+ CreateRequest(tests[i].is_using_lofi);
if (tests[i].is_main_frame)
request->SetLoadFlags(request->load_flags() | net::LOAD_MAIN_FRAME);
net::HttpRequestHeaders headers;
@@ -348,7 +353,7 @@ TEST_F(ContentLoFiDeciderTest, AutoLoFi) {
test_context_->config()->SetNetworkProhibitivelySlow(
tests[i].network_prohibitively_slow);
- scoped_ptr<net::URLRequest> request =
+ std::unique_ptr<net::URLRequest> request =
CreateRequest(tests[i].network_prohibitively_slow);
net::HttpRequestHeaders headers;
NotifyBeforeSendProxyHeaders(&headers, request.get(), true);
@@ -398,7 +403,7 @@ TEST_F(ContentLoFiDeciderTest, SlowConnectionsFlag) {
test_context_->config()->SetNetworkProhibitivelySlow(
tests[i].network_prohibitively_slow);
- scoped_ptr<net::URLRequest> request =
+ std::unique_ptr<net::URLRequest> request =
CreateRequest(tests[i].network_prohibitively_slow);
net::HttpRequestHeaders headers;
NotifyBeforeSendProxyHeaders(&headers, request.get(), true);
@@ -419,7 +424,8 @@ TEST_F(ContentLoFiDeciderTest, ProxyIsNotDataReductionProxy) {
};
for (size_t i = 0; i < arraysize(tests); ++i) {
- scoped_ptr<net::URLRequest> request = CreateRequest(tests[i].is_using_lofi);
+ std::unique_ptr<net::URLRequest> request =
+ CreateRequest(tests[i].is_using_lofi);
net::HttpRequestHeaders headers;
NotifyBeforeSendProxyHeaders(&headers, request.get(), false);
std::string header_value;

Powered by Google App Engine
This is Rietveld 408576698