Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index a36c2227a9ef394fc9a25556d18506c9fee6bad2..a43ecac028cb53156a43ab4c46cbeb747f0085cb 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -1746,10 +1746,10 @@ |
'chrome_browser_nss_sources': [ |
'browser/certificate_manager_model.cc', |
'browser/certificate_manager_model.h', |
- 'browser/net/nss_context.cc', |
- 'browser/net/nss_context.h', |
- 'browser/net/nss_context_chromeos.cc', |
- 'browser/net/nss_context_linux.cc', |
+ 'browser/net/cert_database_service_factory.cc', |
+ 'browser/net/cert_database_service_factory_chromeos.cc', |
+ 'browser/net/cert_database_service_factory_linux.cc', |
+ 'browser/net/cert_database_service_factory.h', |
'third_party/mozilla_security_manager/nsNSSCertHelper.cpp', |
'third_party/mozilla_security_manager/nsNSSCertHelper.h', |
'third_party/mozilla_security_manager/nsNSSCertificate.cpp', |
@@ -3202,13 +3202,16 @@ |
}], |
['use_nss==1', { |
'sources': [ '<@(chrome_browser_nss_sources)' ], |
- 'conditions': [ |
- ['chromeos==1', { |
- 'sources!': [ 'browser/net/nss_context_linux.cc' ], |
- }, { # chromeos==0 |
- 'sources!': [ 'browser/net/nss_context_chromeos.cc' ], |
- }], |
+ 'dependencies': [ |
+ '../components/components.gyp:cert_database', |
], |
+ 'conditions': [ |
+ ['desktop_linux==0', { |
+ 'sources!': [ |
+ 'browser/net/cert_database_service_factory_linux.cc' |
+ ], |
+ }], |
+ ], |
}], |
['notifications==1', { |
'sources': [ '<@(chrome_browser_notifications_sources)' ], |