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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/proxy/proxy_service_unittest.cc

Issue 2259823002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 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 | « net/proxy/proxy_service_mojo_unittest.cc ('k') | net/proxy/proxy_service_v8.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service_unittest.cc
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index 066a3eb74210bab85d13cfbbf98ee1da9eb90040..6b379bacbc2c80410ccb00ddf663008cf2b2b3da 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -364,7 +364,7 @@ TEST_F(ProxyServiceTest, Direct) {
MockAsyncProxyResolverFactory* factory =
new MockAsyncProxyResolverFactory(false);
ProxyService service(
- base::WrapUnique(new MockProxyConfigService(ProxyConfig::CreateDirect())),
+ base::MakeUnique<MockProxyConfigService>(ProxyConfig::CreateDirect()),
base::WrapUnique(factory), nullptr);
GURL url("http://www.google.com/");
@@ -400,7 +400,7 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackAddProxy) {
config.set_auto_detect(false);
config.proxy_rules().bypass_rules.ParseFromString("*.org");
- ProxyService service(base::WrapUnique(new MockProxyConfigService(config)),
+ ProxyService service(base::MakeUnique<MockProxyConfigService>(config),
nullptr, nullptr);
GURL url("http://www.google.com/");
@@ -456,7 +456,7 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackRemoveProxy) {
config.set_auto_detect(false);
config.proxy_rules().bypass_rules.ParseFromString("*.org");
- ProxyService service(base::WrapUnique(new MockProxyConfigService(config)),
+ ProxyService service(base::MakeUnique<MockProxyConfigService>(config),
nullptr, nullptr);
GURL url("http://www.google.com/");
@@ -1071,7 +1071,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsParsingJavaScriptMandatoryPac) {
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
service.SetProxyScriptFetchers(
- fetcher, base::WrapUnique(new DoNothingDhcpProxyScriptFetcher()));
+ fetcher, base::MakeUnique<DoNothingDhcpProxyScriptFetcher>());
// Start resolve request.
GURL url("http://www.google.com/");
@@ -1690,7 +1690,7 @@ TEST_F(ProxyServiceTest, ProxyBypassList) {
config.set_auto_detect(false);
config.proxy_rules().bypass_rules.ParseFromString("*.org");
- ProxyService service(base::WrapUnique(new MockProxyConfigService(config)),
+ ProxyService service(base::MakeUnique<MockProxyConfigService>(config),
nullptr, nullptr);
int rv;
@@ -1731,7 +1731,7 @@ TEST_F(ProxyServiceTest, MarkProxiesAsBadTests) {
EXPECT_EQ(3u, additional_bad_proxies.size());
- ProxyService service(base::WrapUnique(new MockProxyConfigService(config)),
+ ProxyService service(base::MakeUnique<MockProxyConfigService>(config),
nullptr, nullptr);
ProxyInfo proxy_info;
proxy_info.UseProxyList(proxy_list);
@@ -1752,7 +1752,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
config.proxy_rules().ParseFromString("http=foopy1:8080;https=foopy2:8080");
config.set_auto_detect(false);
{
- ProxyService service(base::WrapUnique(new MockProxyConfigService(config)),
+ ProxyService service(base::MakeUnique<MockProxyConfigService>(config),
nullptr, nullptr);
GURL test_url("http://www.msn.com");
ProxyInfo info;
@@ -1765,7 +1765,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
}
{
- ProxyService service(base::WrapUnique(new MockProxyConfigService(config)),
+ ProxyService service(base::MakeUnique<MockProxyConfigService>(config),
nullptr, nullptr);
GURL test_url("ftp://ftp.google.com");
ProxyInfo info;
@@ -1778,7 +1778,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
EXPECT_EQ("direct://", info.proxy_server().ToURI());
}
{
- ProxyService service(base::WrapUnique(new MockProxyConfigService(config)),
+ ProxyService service(base::MakeUnique<MockProxyConfigService>(config),
nullptr, nullptr);
GURL test_url("https://webbranch.techcu.com");
ProxyInfo info;
@@ -1792,7 +1792,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
}
{
config.proxy_rules().ParseFromString("foopy1:8080");
- ProxyService service(base::WrapUnique(new MockProxyConfigService(config)),
+ ProxyService service(base::MakeUnique<MockProxyConfigService>(config),
nullptr, nullptr);
GURL test_url("http://www.microsoft.com");
ProxyInfo info;
@@ -1814,7 +1814,7 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) {
ProxyConfig config;
config.set_source(PROXY_CONFIG_SOURCE_TEST);
config.proxy_rules().ParseFromString("https=foopy2:8080");
- ProxyService service(base::WrapUnique(new MockProxyConfigService(config)),
+ ProxyService service(base::MakeUnique<MockProxyConfigService>(config),
nullptr, nullptr);
GURL test_url("http://www.google.com");
ProxyInfo info;
@@ -1830,7 +1830,7 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) {
ProxyConfig config;
config.set_source(PROXY_CONFIG_SOURCE_TEST);
config.proxy_rules().ParseFromString("https=foopy2:8080");
- ProxyService service(base::WrapUnique(new MockProxyConfigService(config)),
+ ProxyService service(base::MakeUnique<MockProxyConfigService>(config),
nullptr, nullptr);
GURL test_url("https://www.google.com");
ProxyInfo info;
@@ -1845,7 +1845,7 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) {
{
ProxyConfig config;
config.set_source(PROXY_CONFIG_SOURCE_TEST);
- ProxyService service(base::WrapUnique(new MockProxyConfigService(config)),
+ ProxyService service(base::MakeUnique<MockProxyConfigService>(config),
nullptr, nullptr);
GURL test_url("http://www.google.com");
ProxyInfo info;
@@ -2608,7 +2608,7 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) {
ProxyConfig config1;
config1.proxy_rules().ParseFromString("foopy1:8080");
config1.set_auto_detect(false);
- ProxyService service(base::WrapUnique(new MockProxyConfigService(config1)),
+ ProxyService service(base::MakeUnique<MockProxyConfigService>(config1),
nullptr, nullptr);
ProxyInfo info;
@@ -2622,8 +2622,7 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) {
ProxyConfig config2;
config2.proxy_rules().ParseFromString("foopy2:8080");
config2.set_auto_detect(false);
- service.ResetConfigService(
- base::WrapUnique(new MockProxyConfigService(config2)));
+ service.ResetConfigService(base::MakeUnique<MockProxyConfigService>(config2));
TestCompletionCallback callback2;
rv = service.ResolveProxy(GURL("http://request2"), std::string(), &info,
callback2.callback(), nullptr, nullptr,
@@ -2700,7 +2699,7 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
service.SetProxyScriptFetchers(
- fetcher, base::WrapUnique(new DoNothingDhcpProxyScriptFetcher()));
+ fetcher, base::MakeUnique<DoNothingDhcpProxyScriptFetcher>());
// Disable the "wait after IP address changes" hack, so this unit-test can
// complete quickly.
« no previous file with comments | « net/proxy/proxy_service_mojo_unittest.cc ('k') | net/proxy/proxy_service_v8.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698