Ensure that NSS HTTP IO is initialized on iOS.

chrome/browser/io_thread.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/io_thread.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 42 matching lines @@
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_script_fetcher_impl.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_throttler_manager.h"
 
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
 #include "net/ocsp/nss_ocsp.h"
-#endif  // defined(USE_NSS)
+#endif  // defined(USE_NSS) || defined(OS_IOS)

[wtc, 2012/11/29 19:24:33]

Please let me know if you prefer that I simply remove these
#endif comments. I think they clutter the code when the
conditionally-compiled section of code is very short.

[Ryan Sleevi, 2012/11/29 20:35:13]

Agreed

 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #endif  // defined(OS_CHROMEOS)
 
 using content::BrowserThread;
 
 class SafeBrowsingURLRequestContext;
 
 // The IOThread object must outlive any tasks posted to the IO thread before the
 // Quit task, so base::Bind() calls are not refcounted.
 
 namespace {
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 void ObserveKeychainEvents() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   net::CertDatabase::GetInstance()->SetMessageLoopForKeychainEvents();
 }
 #endif
 
 // Used for the "system" URLRequestContext.
 class SystemURLRequestContext : public net::URLRequestContext {
  public:
   SystemURLRequestContext() {
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
     net::SetURLRequestContextForNSSHttpIO(this);
-#endif  // defined(USE_NSS)
+#endif  // defined(USE_NSS) || defined(OS_IOS)
   }
 
  private:
   virtual ~SystemURLRequestContext() {
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
     net::SetURLRequestContextForNSSHttpIO(NULL);
-#endif  // defined(USE_NSS)
+#endif  // defined(USE_NSS) || defined(OS_IOS)
   }
 };
 
 scoped_ptr<net::HostResolver> CreateGlobalHostResolver(net::NetLog* net_log) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   bool allow_async_dns_field_trial = true;
 
   net::HostResolver::Options options;
 
@@ skipping 294 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!system_url_request_context_getter_) {
     InitSystemRequestContext();
   }
   return system_url_request_context_getter_;
 }
 
 void IOThread::Init() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
   net::SetMessageLoopForNSSHttpIO();
-#endif  // defined(USE_NSS)
+#endif  // defined(USE_NSS) || defined(OS_IOS)
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   DCHECK(!globals_);
   globals_ = new Globals;
 
   // Add an observer that will emit network change events to the ChromeNetLog.
   // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be
   // logging the network change before other IO thread consumers respond to it.
   network_change_observer_.reset(
@@ skipping 140 matching lines @@
   // error.
   weak_factory_.DetachFromThread();
 }
 
 void IOThread::CleanUp() {
   base::debug::LeakTracker<SafeBrowsingURLRequestContext>::CheckForLeaks();
 
   delete sdch_manager_;
   sdch_manager_ = NULL;
 
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
   net::ShutdownNSSHttpIO();
-#endif  // defined(USE_NSS)
+#endif  // defined(USE_NSS) || defined(OS_IOS)
 
   system_url_request_context_getter_ = NULL;
 
   // Release objects that the net::URLRequestContext could have been pointing
   // to.
 
   // This must be reset before the ChromeNetLog is destroyed.
   network_change_observer_.reset();
 
   system_proxy_config_service_.reset();
@@ skipping 143 matching lines @@
       new net::HttpNetworkLayer(
           new net::HttpNetworkSession(system_params)));
   globals_->system_ftp_transaction_factory.reset(
       new net::FtpNetworkLayer(globals_->host_resolver.get()));
   globals_->system_request_context.reset(
       ConstructSystemRequestContext(globals_, net_log_));
 
   sdch_manager_->set_sdch_fetcher(
       new SdchDictionaryFetcher(system_url_request_context_getter_.get()));
 }