Introduce USE_OPENSSL_CERTS for certificate handling.

net/ssl/server_bound_cert_service_unittest.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 "net/ssl/server_bound_cert_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/task_runner.h"
 #include "crypto/ec_private_key.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/cert/asn1_util.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/default_server_bound_cert_store.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
-#if !defined(USE_OPENSSL)
+#if !defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)
 void FailTest(int /* result */) {
   FAIL();
 }
 
 // Simple task runner that refuses to actually post any tasks. This simulates
 // a TaskRunner that has been shutdown, by returning false for any attempt to
 // add new tasks.
 class FailingTaskRunner : public base::TaskRunner {
  public:
   FailingTaskRunner() {}
@@ skipping 72 matching lines @@
     cert_count_ = 1;
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::Bind(callback_,
                                                     err,
                                                     server_identifier_,
                                                     expiration_time,
                                                     private_key,
                                                     cert));
 }
 
-#endif  // !defined(USE_OPENSSL)
+#endif  // !defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)
 
 class ServerBoundCertServiceTest : public testing::Test {
  public:
   ServerBoundCertServiceTest()
       : service_(new ServerBoundCertService(
             new DefaultServerBoundCertStore(NULL),
             base::MessageLoopProxy::current())) {
   }
 
  protected:
@@ skipping 13 matching lines @@
             ServerBoundCertService::GetDomainForHost("appspot.com"));
   EXPECT_EQ("google.com",
             ServerBoundCertService::GetDomainForHost("www.mail.google.com"));
   EXPECT_EQ("goto",
             ServerBoundCertService::GetDomainForHost("goto"));
   EXPECT_EQ("127.0.0.1",
             ServerBoundCertService::GetDomainForHost("127.0.0.1"));
 }
 
 // See http://crbug.com/91512 - implement OpenSSL version of CreateSelfSigned.
-#if !defined(USE_OPENSSL)
+#if !defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)

[mattm, 2014/03/20 23:40:24]

It looks like crbug.com/91512 was fixed. Can these ifdefs just be removed?

[haavardm, 2014/03/21 13:08:21]

Thanks, I wasn't aware of that. I'll try to remove.

 
 TEST_F(ServerBoundCertServiceTest, GetCacheMiss) {
   std::string host("encrypted.google.com");
 
   int error;
   TestCompletionCallback callback;
   ServerBoundCertService::RequestHandle request_handle;
 
   // Synchronous completion, because the store is initialized.
   std::string private_key, der_cert;
@@ skipping 603 matching lines @@
   EXPECT_EQ(1u, service_->workers_created());
   EXPECT_EQ(1u, service_->inflight_joins());
   EXPECT_FALSE(der_cert1.empty());
   EXPECT_EQ(der_cert1, der_cert2);
   EXPECT_FALSE(private_key1.empty());
   EXPECT_EQ(private_key1, private_key2);
   EXPECT_FALSE(request_handle1.is_active());
   EXPECT_FALSE(request_handle2.is_active());
 }
 
-#endif  // !defined(USE_OPENSSL)
+#endif  // !defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)
 
 }  // namespace
 
 }  // namespace net