| Index: chrome/chrome_browser.gypi
 | 
| diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
 | 
| index 95dc97ed0c73cc9a947cd9ee1b95b8a3080ca2a3..3101f6a95ae7ccc878019e739d64a25cc2f7370c 100644
 | 
| --- a/chrome/chrome_browser.gypi
 | 
| +++ b/chrome/chrome_browser.gypi
 | 
| @@ -1012,6 +1012,10 @@
 | 
|        'browser/password_manager/credential_android.h',
 | 
|        'browser/password_manager/generated_password_saved_infobar_delegate_android.cc',
 | 
|        'browser/password_manager/generated_password_saved_infobar_delegate_android.h',
 | 
| +      'browser/password_manager/password_manager_infobar_delegate.cc',
 | 
| +      'browser/password_manager/password_manager_infobar_delegate.h',
 | 
| +      'browser/password_manager/save_password_infobar_delegate.cc',
 | 
| +      'browser/password_manager/save_password_infobar_delegate.h',
 | 
|        'browser/password_manager/update_password_infobar_delegate.cc',
 | 
|        'browser/password_manager/update_password_infobar_delegate.h',
 | 
|        'browser/permissions/permission_queue_controller.cc',
 | 
| @@ -2262,13 +2266,6 @@
 | 
|        'browser/password_manager/simple_password_store_mac.cc',
 | 
|        'browser/password_manager/simple_password_store_mac.h',
 | 
|      ],
 | 
| -    # Used on Mac and Android platforms.
 | 
| -    'chrome_browser_password_manager_mac_android_sources': [
 | 
| -      'browser/password_manager/password_manager_infobar_delegate.cc',
 | 
| -      'browser/password_manager/password_manager_infobar_delegate.h',
 | 
| -      'browser/password_manager/save_password_infobar_delegate.cc',
 | 
| -      'browser/password_manager/save_password_infobar_delegate.h',
 | 
| -    ],
 | 
|      'chrome_browser_permissions_sources': [
 | 
|        'browser/permissions/chooser_context_base.cc',
 | 
|        'browser/permissions/chooser_context_base.h',
 | 
| @@ -3491,11 +3488,6 @@
 | 
|            ],
 | 
|            'sources': [ '<@(chrome_browser_mac_sources)' ]
 | 
|          }],
 | 
| -        ['OS=="mac" or OS=="android"', {
 | 
| -          'sources': [
 | 
| -            '<@(chrome_browser_password_manager_mac_android_sources)',
 | 
| -          ],
 | 
| -        }],
 | 
|          ['chromeos==1', {
 | 
|            'sources!': [
 | 
|              'browser/signin/chrome_signin_status_metrics_provider_delegate.cc',
 | 
| 
 |