| Index: chrome/chrome_browser.gypi
|
| diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
|
| index a233a691caf34ed8ef97a7e1bc4f83058b080a3e..a7728c06ecad5948e50008b3bdbf173254a936a8 100644
|
| --- a/chrome/chrome_browser.gypi
|
| +++ b/chrome/chrome_browser.gypi
|
| @@ -1743,10 +1743,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',
|
| @@ -3221,13 +3221,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)' ],
|
|
|