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

Unified Diff: net/base/run_all_unittests.cc

Issue 6561003: Remove the workaround for bug 43461. Use a g_use_system_ssl... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | « chrome/browser/browser_main_win.cc ('k') | net/socket/client_socket_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/run_all_unittests.cc
===================================================================
--- net/base/run_all_unittests.cc (revision 75692)
+++ net/base/run_all_unittests.cc (working copy)
@@ -6,9 +6,6 @@
#include "base/metrics/histogram.h"
#include "base/nss_util.h"
#include "net/base/net_test_suite.h"
-#if defined(OS_WIN)
-#include "net/socket/ssl_client_socket_nss_factory.h"
-#endif
int main(int argc, char** argv) {
// Record histograms, so we can get histograms data in tests.
@@ -16,10 +13,6 @@
NetTestSuite test_suite(argc, argv);
#if defined(OS_WIN)
- // Use NSS for SSL on Windows. TODO(wtc): this should eventually be hidden
- // inside DefaultClientSocketFactory::CreateSSLClientSocket.
- net::ClientSocketFactory::SetSSLClientSocketFactory(
- net::SSLClientSocketNSSFactory);
// We want to be sure to init NSPR on the main thread.
base::EnsureNSPRInit();
#endif
« no previous file with comments | « chrome/browser/browser_main_win.cc ('k') | net/socket/client_socket_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698