| Index: chrome/chrome_browser.gypi | 
| diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi | 
| index 5ec1d7680445664b242f174d4962007219e5058e..08c890bc2041b557db828b91c32896c945ea4cb0 100644 | 
| --- a/chrome/chrome_browser.gypi | 
| +++ b/chrome/chrome_browser.gypi | 
| @@ -1935,14 +1935,14 @@ | 
| 'browser/storage_monitor/portable_device_watcher_win.h', | 
| 'browser/storage_monitor/removable_device_constants.cc', | 
| 'browser/storage_monitor/removable_device_constants.h', | 
| -        'browser/storage_monitor/removable_device_notifications_chromeos.cc', | 
| -        'browser/storage_monitor/removable_device_notifications_chromeos.h', | 
| -        'browser/storage_monitor/removable_device_notifications_linux.cc', | 
| -        'browser/storage_monitor/removable_device_notifications_linux.h', | 
| -        'browser/storage_monitor/removable_device_notifications_mac.h', | 
| -        'browser/storage_monitor/removable_device_notifications_mac.mm', | 
| -        'browser/storage_monitor/removable_device_notifications_window_win.cc', | 
| -        'browser/storage_monitor/removable_device_notifications_window_win.h', | 
| +        'browser/storage_monitor/storage_monitor_chromeos.cc', | 
| +        'browser/storage_monitor/storage_monitor_chromeos.h', | 
| +        'browser/storage_monitor/storage_monitor_linux.cc', | 
| +        'browser/storage_monitor/storage_monitor_linux.h', | 
| +        'browser/storage_monitor/storage_monitor_mac.h', | 
| +        'browser/storage_monitor/storage_monitor_mac.mm', | 
| +        'browser/storage_monitor/storage_monitor_win.cc', | 
| +        'browser/storage_monitor/storage_monitor_win.h', | 
| 'browser/storage_monitor/removable_storage_observer.h', | 
| 'browser/storage_monitor/storage_monitor.cc', | 
| 'browser/storage_monitor/storage_monitor.h', | 
| @@ -2558,8 +2558,8 @@ | 
| ['exclude', 'browser/policy/user_policy_signin_service_factory.cc'], | 
| ['exclude', 'browser/policy/user_policy_signin_service_factory.h'], | 
| ['exclude', 'browser/speech/tts_linux.cc'], | 
| -            ['exclude', 'browser/storage_monitor/removable_device_notifications_linux.cc'], | 
| -            ['exclude', 'browser/storage_monitor/removable_device_notifications_linux.h'], | 
| +            ['exclude', 'browser/storage_monitor/storage_monitor_linux.cc'], | 
| +            ['exclude', 'browser/storage_monitor/storage_monitor_linux.h'], | 
| ['exclude', 'browser/ui/webui/help/version_updater_basic.cc'], | 
| ['exclude', 'browser/ui/webui/help/version_updater_basic.h'], | 
| ['exclude', 'browser/upgrade_detector_impl.cc'], | 
|  |