1 files changed, 6 insertions, 13 deletions

diff --git a/chromium/net/cert/test_root_certs.h b/chromium/net/cert/test_root_certs.h
index 836f29f2426..80e26eefecf 100644
--- a/chromium/net/cert/test_root_certs.h
+++ b/chromium/net/cert/test_root_certs.h
@@ -65,8 +65,6 @@ class NET_EXPORT TestRootCerts {
   // certificates stored in |temporary_roots_|. If IsEmpty() is true, this
   // does not modify |trust_ref|.
   OSStatus FixupSecTrustRef(SecTrustRef trust_ref) const;
-
-  TrustStore* test_trust_store() { return &test_trust_store_; }
 #elif defined(OS_WIN)
   HCERTSTORE temporary_roots() const { return temporary_roots_; }
 
@@ -75,33 +73,28 @@ class NET_EXPORT TestRootCerts {
   // engine is appropriate. The caller is responsible for freeing the
   // returned HCERTCHAINENGINE.
   HCERTCHAINENGINE GetChainEngine() const;
-#elif defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-  TrustStore* test_trust_store() { return &test_trust_store_; }
 #endif
 
+  TrustStore* test_trust_store() { return &test_trust_store_; }
+
  private:
   friend struct base::LazyInstanceTraitsBase<TestRootCerts>;
 
   TestRootCerts();
   ~TestRootCerts();
 
-  // Performs platform-dependent initialization.
+  // Performs platform-dependent operations.
   void Init();
+  bool AddImpl(X509Certificate* certificate);
+  void ClearImpl();
 
 #if defined(OS_WIN)
   HCERTSTORE temporary_roots_;
 #elif defined(OS_APPLE)
   base::ScopedCFTypeRef<CFMutableArrayRef> temporary_roots_;
-  TrustStoreInMemory test_trust_store_;
-#elif defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-  TrustStoreInMemory test_trust_store_;
 #endif
 
-#if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
-    defined(OS_LINUX) || defined(OS_CHROMEOS)
-  // True if there are no temporarily trusted root certificates.
-  bool empty_ = true;
-#endif
+  TrustStoreInMemory test_trust_store_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRootCerts);
 };