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

Side by Side Diff: chrome/test/plugin/plugin_test.cpp

Issue 3646004: Add an option ProxyService::Create() to disable use of proxy auto-config.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix a typo Created 10 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/service/net/service_url_request_context.cc ('k') | chrome_frame/metrics_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Tests for the top plugins to catch regressions in our plugin host code, as 5 // Tests for the top plugins to catch regressions in our plugin host code, as
6 // well as in the out of process code. Currently this tests: 6 // well as in the out of process code. Currently this tests:
7 // Flash 7 // Flash
8 // Real 8 // Real
9 // QuickTime 9 // QuickTime
10 // Windows Media Player 10 // Windows Media Player
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 host_resolver_ = 218 host_resolver_ =
219 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, 219 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
220 NULL); 220 NULL);
221 net::ProxyConfigService* proxy_config_service = 221 net::ProxyConfigService* proxy_config_service =
222 net::ProxyService::CreateSystemProxyConfigService(NULL, NULL); 222 net::ProxyService::CreateSystemProxyConfigService(NULL, NULL);
223 DCHECK(proxy_config_service); 223 DCHECK(proxy_config_service);
224 224
225 const size_t kNetLogBound = 50u; 225 const size_t kNetLogBound = 50u;
226 net_log_.reset(new net::CapturingNetLog(kNetLogBound)); 226 net_log_.reset(new net::CapturingNetLog(kNetLogBound));
227 227
228 proxy_service_ = net::ProxyService::Create(proxy_config_service, false, 0, 228 proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver(
229 this, net_log_.get(), 229 proxy_config_service, 0, net_log_.get());
230 MessageLoop::current());
231 DCHECK(proxy_service_); 230 DCHECK(proxy_service_);
232 231
233 ssl_config_service_ = new net::SSLConfigServiceDefaults; 232 ssl_config_service_ = new net::SSLConfigServiceDefaults;
234 http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault( 233 http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(
235 host_resolver_); 234 host_resolver_);
236 http_transaction_factory_ = new net::HttpCache( 235 http_transaction_factory_ = new net::HttpCache(
237 net::HttpNetworkLayer::CreateFactory(host_resolver_, 236 net::HttpNetworkLayer::CreateFactory(host_resolver_,
238 NULL /* dnsrr_resolver */, 237 NULL /* dnsrr_resolver */,
239 proxy_service_, 238 proxy_service_,
240 ssl_config_service_, 239 ssl_config_service_,
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 TEST_F(PluginInstallerDownloadTest, PluginInstallerDownloadPathTest) { 297 TEST_F(PluginInstallerDownloadTest, PluginInstallerDownloadPathTest) {
299 MessageLoop loop(MessageLoop::TYPE_IO); 298 MessageLoop loop(MessageLoop::TYPE_IO);
300 Start(); 299 Start();
301 loop.Run(); 300 loop.Run();
302 301
303 EXPECT_TRUE(success()); 302 EXPECT_TRUE(success());
304 EXPECT_TRUE(initial_download_path().BaseName().value() == 303 EXPECT_TRUE(initial_download_path().BaseName().value() ==
305 final_download_path().BaseName().value()); 304 final_download_path().BaseName().value());
306 } 305 }
307 #endif // defined(OS_WIN) 306 #endif // defined(OS_WIN)
OLDNEW
« no previous file with comments | « chrome/service/net/service_url_request_context.cc ('k') | chrome_frame/metrics_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698