Introduce USE_OPENSSL_CERTS for certificate handling.

net/url_request/url_request_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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #endif
@@ skipping 6926 matching lines @@
 #else
   return false;
 #endif
 }
 
 // SystemUsesChromiumEVMetadata returns true iff the current operating system
 // uses Chromium's EV metadata (i.e. EVRootCAMetadata). If it does not, then
 // several tests are effected because our testing EV certificate won't be
 // recognised as EV.
 static bool SystemUsesChromiumEVMetadata() {
-#if defined(USE_OPENSSL)
+#if defined(USE_OPENSSL_CERTS) || defined(OS_ANDROID)

[wtc, 2014/03/20 21:14:56]

I think this function should return false on Android, but not for the reason
that "OpenSSL does not support EV validation". So we probably should add ||
defined(OS_ANDROID) to the OS X case below and update the comment on line 6951.

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

Thanks, I was quite unsure about this one. I'll do some more testing.

   // http://crbug.com/117478 - OpenSSL does not support EV validation.
   return false;
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
   // On OS X, we use the system to tell us whether a certificate is EV or not
   // and the system won't recognise our testing root.
   return false;
 #else
   return true;
 #endif
 }
@@ skipping 710 matching lines @@
 
     EXPECT_FALSE(r.is_pending());
     EXPECT_EQ(1, d->response_started_count());
     EXPECT_FALSE(d->received_data_before_response());
     EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size));
   }
 }
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
 }  // namespace net