Introduce USE_OPENSSL_CERTS for certificate handling.

net/ssl/server_bound_cert_service_unittest.cc

Index: net/ssl/server_bound_cert_service_unittest.cc
diff --git a/net/ssl/server_bound_cert_service_unittest.cc b/net/ssl/server_bound_cert_service_unittest.cc
index 4df003913aa0b74d96558ca05d8a6d5de9e069b6..36ff586f1f41679154de70810a7317e74e6bc1b6 100644
--- a/net/ssl/server_bound_cert_service_unittest.cc
+++ b/net/ssl/server_bound_cert_service_unittest.cc
@@ -24,7 +24,7 @@ namespace net {
 
 namespace {
 
-#if !defined(USE_OPENSSL)
+#if !defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)
 void FailTest(int /* result */) {
   FAIL();
 }
@@ -117,7 +117,7 @@ MockServerBoundCertStoreWithAsyncGet::CallGetServerBoundCertCallbackWithResult(
                                                     cert));
 }
 
-#endif  // !defined(USE_OPENSSL)
+#endif  // !defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)
 
 class ServerBoundCertServiceTest : public testing::Test {
  public:
@@ -151,7 +151,7 @@ TEST_F(ServerBoundCertServiceTest, GetDomainForHost) {
 }
 
 // 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");
@@ -775,7 +775,7 @@ TEST_F(ServerBoundCertServiceTest, AsyncStoreGetThenCreateNoCertsInStore) {
   EXPECT_FALSE(request_handle2.is_active());
 }
 
-#endif  // !defined(USE_OPENSSL)
+#endif  // !defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)
 
 }  // namespace