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

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

Issue 6005015: Revert 70618 - First pass at adding http/backend cache events to the NetLog. ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 net::HttpNetworkLayer::CreateFactory(host_resolver_, 296 net::HttpNetworkLayer::CreateFactory(host_resolver_,
297 cert_verifier_, 297 cert_verifier_,
298 NULL /* dnsrr_resolver */, 298 NULL /* dnsrr_resolver */,
299 NULL /* dns_cert_checker */, 299 NULL /* dns_cert_checker */,
300 NULL /* ssl_host_info_factory */, 300 NULL /* ssl_host_info_factory */,
301 proxy_service_, 301 proxy_service_,
302 ssl_config_service_, 302 ssl_config_service_,
303 http_auth_handler_factory_, 303 http_auth_handler_factory_,
304 network_delegate_, 304 network_delegate_,
305 NULL), 305 NULL),
306 NULL /* net_log */,
307 net::HttpCache::DefaultBackend::InMemory(0)); 306 net::HttpCache::DefaultBackend::InMemory(0));
308 } 307 }
309 308
310 private: 309 private:
311 scoped_ptr<net::NetLog> net_log_; 310 scoped_ptr<net::NetLog> net_log_;
312 scoped_ptr<net::URLSecurityManager> url_security_manager_; 311 scoped_ptr<net::URLSecurityManager> url_security_manager_;
313 }; 312 };
314 313
315 PluginInstallerDownloadTest() 314 PluginInstallerDownloadTest()
316 : success_(false), 315 : success_(false),
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 TEST_F(PluginInstallerDownloadTest, PluginInstallerDownloadPathTest) { 360 TEST_F(PluginInstallerDownloadTest, PluginInstallerDownloadPathTest) {
362 MessageLoop loop(MessageLoop::TYPE_IO); 361 MessageLoop loop(MessageLoop::TYPE_IO);
363 Start(); 362 Start();
364 loop.Run(); 363 loop.Run();
365 364
366 EXPECT_TRUE(success()); 365 EXPECT_TRUE(success());
367 EXPECT_TRUE(initial_download_path().BaseName().value() == 366 EXPECT_TRUE(initial_download_path().BaseName().value() ==
368 final_download_path().BaseName().value()); 367 final_download_path().BaseName().value());
369 } 368 }
370 #endif // defined(OS_WIN) 369 #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