Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/chromium/net/cert/cert_database.h b/chromium/net/cert/cert_database.h
index c4ead812f2f..feadf4c1d08 100644
--- a/chromium/net/cert/cert_database.h
+++ b/chromium/net/cert/cert_database.h
@@ -40,8 +40,9 @@ class NET_EXPORT CertDatabase {
     // Will be called when a certificate is removed.
     virtual void OnCertRemoved(const X509Certificate* cert) {}
 
-    // Will be called when a certificate's trust is changed.
-    virtual void OnCertTrustChanged(const X509Certificate* cert) {}
+    // Will be called when a CA certificate was added, removed, or its trust
+    // changed. This can also mean that a client certificate's trust changed.
+    virtual void OnCACertChanged(const X509Certificate* cert) {}
 
    protected:
     Observer() {}
@@ -78,6 +79,12 @@ class NET_EXPORT CertDatabase {
   void SetMessageLoopForKeychainEvents();
 #endif
 
+#if defined(OS_ANDROID)
+  // On android, the system database is used. When the system notifies the
+  // application that the certificates changed, the observers must be notified.
+  void OnAndroidKeyChainChanged();
+#endif
+
  private:
   friend struct DefaultSingletonTraits<CertDatabase>;
 
@@ -87,7 +94,7 @@ class NET_EXPORT CertDatabase {
   // Broadcasts notifications to all registered observers.
   void NotifyObserversOfCertAdded(const X509Certificate* cert);
   void NotifyObserversOfCertRemoved(const X509Certificate* cert);
-  void NotifyObserversOfCertTrustChanged(const X509Certificate* cert);
+  void NotifyObserversOfCACertChanged(const X509Certificate* cert);
 
   const scoped_refptr<ObserverListThreadSafe<Observer> > observer_list_;