Implement TestRootCerts for Android

net/base/test_root_certs.h

 // 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.
 
 #ifndef NET_BASE_TEST_ROOT_CERTS_H_
 #define NET_BASE_TEST_ROOT_CERTS_H_
 
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
@@ skipping 73 matching lines @@
   // It is necessary to maintain a cache of the original certificate trust
   // settings, in order to restore them when Clear() is called.
   class TrustEntry;
   std::list<TrustEntry*> trust_cache_;
 #elif defined(OS_WIN)
   HCERTSTORE temporary_roots_;
 #elif defined(OS_MACOSX)
   base::mac::ScopedCFTypeRef<CFMutableArrayRef> temporary_roots_;
 #endif
 
-#if defined(OS_WIN) || defined(USE_OPENSSL)
+#if defined(OS_WIN) || defined(USE_OPENSSL) || defined(OS_ANDROID)

[Ryan Sleevi, 2012/12/07 03:25:26]

Isn't this redundant here - USE_OPENSSL is always true for OS_ANDROID

[ppi, 2012/12/11 04:24:21]

David already pointed this out earlier (so that's 2:1 in favor of removal).

My rationale for introducing the condition is the following:

"I wonder if relying on the USE_OPENSSL flag being defined on Android in this
case is not unnecessary coupling (what if we drop OpenSSL on Android in the
future?).

Also, shouldn't it be possible to read the code of test_root_certs.h in the
context of test_root_certs_android.cc without the knowledge about the
USE_OPENSSL flag being defined on Android?"

Please let me know if that seems convincing to you.

[Ryan Sleevi, 2012/12/11 17:40:10]

Whenever such a comment is coupled with "more code", I tend to be resistant.
"What ifs" can easily be used to justify a lot.
To date, we've hidden the fact that Android is using OpenSSL (except where it
isn't) by simply using USE_OPENSSL as the #define, and using code substitution
(via .gyp).

In general, I'm in favour of exposing as few details as possible about the
implementation within the code itself, and letting the .gyp rules hold as much
as possible.

So I'm not sure this #ifdef really adds much.

[ppi, 2012/12/11 19:12:50]

Removed the condition in patch set 11.

   // True if there are no temporarily trusted root certificates.
   bool empty_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(TestRootCerts);
 };
 
 // Scoped helper for unittests to handle safely managing trusted roots.
 class NET_EXPORT_PRIVATE ScopedTestRoot {
  public:
@@ skipping 11 matching lines @@
 
  private:
   scoped_refptr<X509Certificate> cert_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedTestRoot);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_TEST_ROOT_CERTS_H_