Fixes the remaining net_unittests for OpenSSL, with the exceptions

net/test/test_server.cc

 // Copyright (c) 2010 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 "net/test/test_server.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 296 matching lines @@
       FILE_PATH_LITERAL("device_management_pb")));
 
   return true;
 }
 
 FilePath TestServer::GetRootCertificatePath() {
   return certificates_dir_.AppendASCII("root_ca_cert.crt");
 }
 
 bool TestServer::LoadTestRootCert() {
-#if defined(USE_NSS)
+#if defined(USE_OPENSSL) || defined(USE_NSS)
   if (cert_)
     return true;
 
   // TODO(dkegel): figure out how to get this to only happen once?
 
   // This currently leaks a little memory.
   // TODO(dkegel): fix the leak and remove the entry in
   // tools/valgrind/memcheck/suppressions.txt
   ANNOTATE_SCOPED_MEMORY_LEAK;  // Tell heap checker about the leak.
   cert_ = LoadTemporaryRootCert(GetRootCertificatePath());
@@ skipping 76 matching lines @@
   }
   if ((port <= 0) || (port > kuint16max)) {
     LOG(ERROR) << "Invalid port value: " << port;
     return false;
   }
   host_port_pair_.set_port(port);
   return true;
 }
 
 }  // namespace net