Remove the workaround for bug 43461. Use a g_use_system_ssl...

webkit/tools/test_shell/simple_resource_loader_bridge.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file contains an implementation of the ResourceLoaderBridge class.
 // The class is implemented using net::URLRequest, meaning it is a "simple"
 // version that directly issues requests. The more complicated one used in the
 // browser uses IPC.
 //
 // Because net::URLRequest only provides an asynchronous resource loading API,
@@ skipping 39 matching lines @@
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/static_cookie_policy.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/proxy/proxy_service.h"
-#if defined(OS_WIN)
-#include "net/socket/ssl_client_socket_nss_factory.h"
-#endif
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/blob/blob_url_request_job.h"
 #include "webkit/blob/deletable_file_reference.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/tools/test_shell/simple_appcache_system.h"
 #include "webkit/tools/test_shell/simple_file_writer.h"
 #include "webkit/tools/test_shell/simple_socket_stream_bridge.h"
@@ skipping 805 matching lines @@
       getter.get(), &CookieGetter::Get, url));
 
   return getter->GetResult();
 }
 
 // static
 bool SimpleResourceLoaderBridge::EnsureIOThread() {
   if (g_io_thread)
     return true;
 
-#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);
-#endif
 #if defined(OS_MACOSX) || defined(OS_WIN)
   // We want to be sure to init NSPR on the main thread.
   base::EnsureNSPRInit();
 #endif
 
   // Create the cache thread. We want the cache thread to outlive the IO thread,
   // so its lifetime is bonded to the IO thread lifetime.
   DCHECK(!g_cache_thread);
   g_cache_thread = new base::Thread("cache");
   CHECK(g_cache_thread->StartWithOptions(
@@ skipping 24 matching lines @@
 
 // static
 scoped_refptr<base::MessageLoopProxy>
     SimpleResourceLoaderBridge::GetIoThread() {
   if (!EnsureIOThread()) {
     LOG(DFATAL) << "Failed to create IO thread.";
     return NULL;
   }
   return g_io_thread->message_loop_proxy();
 }