BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 143 insertions, 70 deletions

diff --git a/chromium/WATCHLISTS b/chromium/WATCHLISTS
index b41cd50ed40..bebef27f026 100644
--- a/chromium/WATCHLISTS
+++ b/chromium/WATCHLISTS
@@ -118,6 +118,16 @@
     'base_memory': {
       'filepath': '^base/memory',
     },
+    'base_win': {
+      'filepath': '^base/win',
+    },
+    'battery_status': {
+      'filepath': 'content/browser/battery_status/|'\
+                  'content/common/battery_status_messages.h|'\
+                  'content/public/android/java/src/org/chromium/content/browser/BatteryStatusManager.java|'\
+                  'content/public/android/javatests/src/org/chromium/content/browser/BatteryStatusManagerTest.java|'\
+                  'content/renderer/battery_status/',
+    },
     'bookmarks': {
       'filepath': 'chrome/browser/bookmarks/' \
                   '|chrome/browser/extensions/api/bookmark_manager_private/' \
@@ -128,6 +138,9 @@
                   '|chrome/browser/ui/views/bookmarks/' \
                   '|components/bookmarks'
     },
+    'breakpad_app': {
+      'filepath': 'components/crash/app/',
+    },
     'browser': {
       'filepath': 'chrome/browser/',
     },
@@ -137,7 +150,6 @@
     'browser_components': {
       'filepath': 'chrome/browser/autofill/' \
                   '|chrome/browser/bookmarks/' \
-                  '|chrome/browser/common/' \
                   '|chrome/browser/favicon/' \
                   '|chrome/browser/history/' \
                   '|chrome/browser/webdata/' \
@@ -157,7 +169,12 @@
                   'chrome/browser/ui/views/bubble/',
     },
     'cast': {
-      'filepath': 'media/cast/',
+      'filepath': 'media/cast/'\
+                  '|chrome/browser/extensions/api/cast_streaming/'\
+                  '|chrome/browser/media/cast'\
+                  '|chrome/renderer/media/cast'\
+                  '|chrome/test/data/extensions/api_test/cast_'\
+                  '|content/public/renderer/media_stream_',
     },
     'chromecast': {
       'filepath': 'chromecast/',
@@ -174,7 +191,9 @@
       'filepath': 'chrome/browser/ui/views',
     },
     'chromedriver': {
-      'filepath': 'chrome/test/chromedriver'
+      'filepath': 'chrome/test/chromedriver|'\
+                  'chrome/test/data/chromedriver|'\
+                  'third_party/webdriver'
     },
     'chromeos': {
       'filepath': 'chromeos/',
@@ -187,6 +206,9 @@
     'chromeos_calculator': {
       'filepath': 'chrome/common/extensions/docs/examples/apps/calculator/',
     },
+    'chromeos_dbus': {
+      'filepath': 'chromeos/dbus/',
+    },
     'chromeos_login': {
       'filepath': 'chrome/browser/chromeos/login/|'\
                   'chrome/browser/ui/webui/chromeos/login/|'\
@@ -212,14 +234,24 @@
     'clipboard': {
       'filepath': 'clipboard|dnd|drag|drop',
     },
+    'closure': {
+      'filepath': 'third_party/closure_(compiler|linter)/|'
+                  'compiled_resources.gyp',
+    },
     'content': {
       'filepath': 'content/',
     },
+    'content_bluetooth': {
+      'filepath': 'content/.*bluetooth'
+    },
     'content_input': {
       'filepath': 'content/browser/renderer_host/input/|'\
                   'content/common/input/|'\
                   'content/renderer/input/',
     },
+    'content_renderer': {
+      'filepath': 'content/renderer/',
+    },
     'content_shell': {
       'filepath': 'content/shell/',
     },
@@ -278,6 +310,14 @@
     'drive_resource_metadata': {
       'filepath': 'chrome/browser/chromeos/drive/resource_metadata'
     },
+    'eme': {
+      'filepath': 'components/cdm/|' \
+                  'content/browser/media/cdm/|' \
+                  'content/renderer/media/crypto/|' \
+                  'media/base/android/*drm*|' \
+                  'media/cdm/|' \
+                  'third_party/widevine/cdm/'
+    },
     'events': {
       'filepath': 'ui/events/',
     },
@@ -332,13 +372,17 @@
     'history_ui': {
       'filepath': 'chrome/browser/resources/history',
     },
+    'hotword': {
+      'filepath': 'chrome/browser/extensions/api/hotword_private/'\
+                  '|chrome/browser/resources/hotword_helper/'\
+                  '|chrome/browser/resources/hotword/'\
+                  '|chrome/browser/search/hotword*'\
+                  '|chrome/test/data/extensions/api_test/hotword_private/',
+    },
     'i18n': {
       'filepath': 'base/i18n/|base/string|l10n|icu|'\
         'locale_settings|encoding',
     },
-    'imageburner': {
-      'filepath': 'imageburner'
-    },
     'importer': {
       'filepath': 'import',
     },
@@ -362,12 +406,13 @@
     'ipc': {
       'filepath': 'ipc/ipc',
     },
+    'ipc_messages': {
+      'filepath': '_message.*.h|'\
+                  '_messages.cc',
+    },
     'libwebp': {
       'filepath': 'third_party/libwebp'
     },
-    'layout_tests': {
-      'filepath': 'webkit/(tools|data)/(layout_tests|test_shell)/',
-    },
     'linux_fonts': {
       'filepath': 'ui/gfx/font_render_params_.*|'\
                   'ui/gfx/platform_font_pango.*|'\
@@ -379,10 +424,6 @@
     'linux_seccomp_bpf': {
       'filepath': 'content/common/sandbox.*linux.cc',
     },
-    'managed_users': {
-      'filepath': 'chrome/browser/.*managed_mode'\
-                  '|chrome/browser/.*managed_user',
-    },
     'media': {
       'filepath': 'media/|third_party/(ffmpeg|openmax)/|webmediaplayer|'\
         'audio_message_filter|video_layer|media_internals',
@@ -455,6 +496,11 @@
         'chrome/browser/resources/net_internals/|' \
         'chrome/browser/ui/webui/net_internals/'
     },
+    'notifications': {
+      'filepath': 'chrome/browser/extensions/api/notifications/|' \
+        'chrome/browser/notifications/|' \
+        'ui/message_center/'
+    },
     'npapi_headers': {
       'filepath': 'third_party/npapi/bindings/',
     },
@@ -509,6 +555,9 @@
     'predictors': {
       'filepath': 'predictors',
     },
+    'prepopulated_engines': {
+      'filepath': 'components/search_engines/prepopulated_engines.json',
+    },
     'prerender': {
       'filepath': 'prerender'
     },
@@ -520,6 +569,9 @@
     'remoting': {
       'filepath': 'remoting/',
     },
+    'safe_browsing': {
+      'filepath': 'chrome/(browser|common|renderer)/safe_browsing/',
+    },
     'search': {
       'filepath': 'chrome/browser/ui/search/',
     },
@@ -552,6 +604,11 @@
     'streams': {
       'filepath': 'content/browser/streams/',
     },
+    'supervised_users': {
+      'filepath': 'chrome/browser/.*managed_mode'\
+                  '|chrome/browser/.*managed_user'\
+                  '|chrome/browser/.*supervised_user',
+    },
     'sync': {
       'filepath': 'chrome/browser/sync/|sync/|components/sync_driver/',
     },
@@ -562,27 +619,31 @@
       'filepath': 'sync/protocol/',
     },
     'tab_capture': {
-      'filepath': 'chrome/browser/extensions/api/tab_capture/'\
-        '|chrome/browser/media/media_stream'\
-        '|content/browser/renderer_host/(backing_store|compositing_iosurface|'\
-            'render_widget_host_view)'\
-        '|content/browser/renderer_host/media/(audio_|'\
-            'media_stream_manager\.cc|video_|web_contents_)'\
-        '|content/browser/web_contents/web_contents_impl'\
-        '|content/renderer/media/audio_(device_factory|message_filter|'\
-            'renderer_mixer_manager)'\
-        '|content/renderer/p2p/ipc_socket_factory'\
-        '|content/renderer/pepper/pepper_platform_audio_output'\
-        '|media/audio/(audio_output|fake_audio_consumer|virtual_audio)'\
-        '|media/base/video_util'\
-        '|media/video/capture/video_capture'\
-        '|ui/surface/accelerated_surface.*_win',
+      'filepath': 'cc/output/copy_output_request'\
+        '|chrome/browser/extensions/api/tab_capture/'\
+        '|chrome/test/data/extensions/api_test/tab_capture/'\
+        '|content/browser/compositor/delegated_frame_host'\
+        '|content/browser/media/capture/'\
+        '|content/browser/renderer_host/compositing_iosurface'\
+        '|content/browser/renderer_host/media/(audio_'\
+            '|media_stream_manager|video_)'\
+        '|media/audio/(audio_output_controller|fake_audio_|virtual_audio_)'\
+        '|media/base/video_frame\.h'\
+        '|media/video/capture/video_capture_',
     },
     'tab_contents': {
       'filepath': 'chrome/browser/tab_contents/|'\
         'content/browser/tab_contents/|'\
         'chrome/browser/ui/tab_contents/',
     },
+    'tab_media_indicators': {
+      'filepath': 'chrome/browser/media/audio_stream_monitor'\
+        '|chrome/browser/ui/cocoa/tabs/tab_controller\.mm'\
+        '|chrome/browser/ui/tabs/tab_utils'\
+        '|chrome/browser/ui/views/tabs/tab\.cc'\
+        '|chrome/browser/ui/views/tabs/tab_renderer_data'\
+        '|media/audio/audio_(output_controller|power_monitor)',
+    },
     'task_manager': {
       'filepath': 'task_manager'
     },
@@ -671,6 +732,7 @@
     'webrtc_media': {
       'filepath': 'chrome/browser/media/|'\
                   'content/browser/renderer_host/media/|'\
+                  'content/common/gpu/media/|'\
                   'content/renderer/media/|'\
                   'media/video/|'\
                   'video.*_accelerat',
@@ -679,7 +741,11 @@
       'filepath': 'chrome/browser/content_settings/'\
                   '|chrome/browser/ui/views/website_settings/'\
                   '|chrome/browser/ui/website_settings/'\
-                  '|chrome/common/content_settings',
+                  '|chrome/common/content_settings'\
+                  '|components/content_settings/',
+    },
+    'windows_sandboxing': {
+      'filepath': 'sandbox/win/',
     },
     'worker': {
       'filepath': 'chrome/browser/worker_host/|chrome/worker/|'\
@@ -706,10 +772,9 @@
                       'aboxhall+watch@chromium.org',
                       'yuzo+watch@chromium.org'],
     'activity_log': ['felt@chromium.org'],
-    'android_infra': ['bulach+watch@chromium.org',
-                      'yfriedman+watch@chromium.org',
-                      'ilevy-cc@chromium.org',
-                      'klundberg+watch@chromium.org'],
+    'android_infra': ['yfriedman+watch@chromium.org',
+                      'klundberg+watch@chromium.org',
+                      'jbudorick+watch@chromium.org'],
     'android_media': ['avayvod+watch@chromium.org'],
     'android_tab': ['avayvod+watch@chromium.org', 'dtrainor@chromium.org'],
     'android_webview': ['android-webview-reviews@chromium.org'],
@@ -717,11 +782,9 @@
     'app_shortcuts': ['chrome-apps-syd-reviews@chromium.org'],
     'appcache': ['michaeln@chromium.org'],
     'apps': ['tfarina@chromium.org', 'chromium-apps-reviews@chromium.org'],
-    'ash': ['ben+ash@chromium.org',
-             'sadrul@chromium.org',
-             'kalyan.kondapally@intel.com'],
-    'aura': ['ben+aura@chromium.org',
-             'sadrul@chromium.org',
+    'ash': ['sadrul@chromium.org',
+            'kalyan.kondapally@intel.com'],
+    'aura': ['sadrul@chromium.org',
              'kalyan.kondapally@intel.com'],
     'aura_compositor': ['danakj+watch@chromium.org',
                         'jbauman+watch@chromium.org',
@@ -736,8 +799,11 @@
                  'rouslan+autofillwatch@chromium.org'],
     'automation': ['robertshield@chromium.org'],
     'base': ['erikwright+watch@chromium.org'],
-    'base_allocator': ['dmikurube+memory@chromium.org'],
+    'base_allocator': ['dmikurube@chromium.org',
+                       'wfh+watch@chromium.org'],
     'base_memory': ['gavinp+memory@chromium.org'],
+    'base_win': ['grt+watch@chromium.org', 'wfh+watch@chromium.org'],
+    'battery_status': ['timvolodine@chromium.org'],
     'bookmarks': ['tfarina@chromium.org'],
     'browser_chromeos': ['davemoore+watch@chromium.org',
                          'stevenjb+watch@chromium.org',
@@ -757,15 +823,16 @@
              'mikhal+watch@chromium.org',
              'miu+watch@chromium.org',
              'pwestin+watch@google.com'],
-    'chromecast': ['ozone-reviews@chromium.org'],
     'cc': ['cc-bugs@chromium.org'],
     'chrome_elf': ['caitkp+watch@chromium.org',],
     'chrome_views': ['tfarina@chromium.org'],
-    'chromedriver': ['stgao@chromium.org'],
+    'chromecast': ['gunsch+watch@chromium.org', 'lcwu+watch@chromium.org'],
+    'chromedriver': ['samuong+watch@chromium.org', 'stgao@chromium.org'],
     'chromeos' : ['oshima+watch@chromium.org',
                   'stevenjb+watch@chromium.org'],
     'chromeos_attestation' : ['dkrahn+watch@chromium.org'],
     'chromeos_calculator' : ['dharcourt@chromium.org'],
+    'chromeos_dbus': ['hashimoto+watch@chromium.org'],
     'chromeos_net' : ['stevenjb+watch@chromium.org'],
     'chromeos_power' : ['derat+watch@chromium.org'],
     'chromeos_webui': ['nkostylev+watch@chromium.org'],
@@ -774,12 +841,17 @@
                      'eugenis+clang@chromium.org',
                      'glider+clang@chromium.org'],
     'clipboard': ['dcheng@chromium.org'],
+    'closure': ['dbeam+watch-closure@chromium.org',
+                'vitalyp+closure@chromium.org'],
     'content': ['jam@chromium.org',
-                'darin-cc@chromium.org'],
+                'darin-cc@chromium.org' ],
+    'content_bluetooth': ['scheib+watch@chromium.org'],
     'content_input': ['jdduke+watch@chromium.org'],
-    'content_shell': ['jochen+watch@chromium.org'],
+    'content_renderer': [ 'mkwst+moarreviews-renderer@chromium.org' ],
+    'content_shell': ['jochen+watch@chromium.org',
+                      'mkwst+moarreviews-shell@chromium.org'],
     'cookie_monster': ['erikwright@chromium.org'],
-    'deep_memory_profiler': ['dmikurube+memory@chromium.org'],
+    'deep_memory_profiler': ['dmikurube@chromium.org'],
     'device_sensors': ['timvolodine@chromium.org', 'mvanouwerkerk@chromium.org', 'rijubrata.bhaumik@intel.com'],
     'devtools': ['pfeldman@chromium.org', 'yurys@chromium.org',
                  'vsevik@chromium.org', 'aandrey+blink@chromium.org',
@@ -793,6 +865,7 @@
     'downloads_ui': ['asanka@chromium.org', 'benjhayden+dwatch@chromium.org'],
     'drive': ['tfarina@chromium.org'],
     'drive_resource_metadata': ['hashimoto+watch@chromium.org'],
+    'eme': ['eme-reviews@chromium.org'],
     'events': ['tdresser+watch@chromium.org'],
     'extension': ['chromium-apps-reviews@chromium.org',
                   'extensions-reviews@chromium.org'],
@@ -810,26 +883,24 @@
     'gn': ['tfarina@chromium.org'],
     'gpu': ['piman+watch@chromium.org'],
     'history_ui': ['dubroy@chromium.org', 'pam+watch@chromium.org'],
+    'hotword': ['rlp+watch@chromium.org'],
     'i18n': ['jshin+watch@chromium.org'],
-    'imageburner': ['tbarzic+watch@chromium.org'],
     'importer': ['tfarina@chromium.org'],
-    'indexed_db': ['alecflett@chromium.org', 'cmumford@chromium.org',
-                   'dgrogan@chromium.org',
-                   'ericu+idb@chromium.org', 'jsbell+idb@chromium.org'],
-    'installer': ['grt+watch@chromium.org'],
+    'indexed_db': ['cmumford@chromium.org',
+                   'dgrogan@chromium.org', 'jsbell+idb@chromium.org'],
+    'installer': ['grt+watch@chromium.org', 'wfh+watch@chromium.org'],
     'instant': ['dcblack@chromium.org', 'jered@chromium.org',
-                'dominich@chromium.org', 'samarth+watch@chromium.org',
+                'samarth+watch@chromium.org', 'donnd+watch@chromium.org',
                 'melevin+watch@chromium.org', 'dougw+watch@chromium.org',
                 'kmadhusu+watch@chromium.org', 'dhollowa+watch@chromium.org',
-                'jfweitz+watch@chromium.org', 'skanuj+watch@chromium.org',
-                'donnd+watch@chromium.org'],
+                'jfweitz+watch@chromium.org', 'skanuj+watch@chromium.org'],
     'ipc': ['jam@chromium.org', 'darin-cc@chromium.org'],
     'libwebp': ['urvang@google.com', 'jzern@chromium.org',
                 'skal@google.com', 'vikasa@google.com'],
     'linux_fonts': ['derat+watch@chromium.org'],
-    'linux_sandboxing': ['agl@chromium.org', 'jln+watch@chromium.org'],
+    'linux_sandboxing': ['jln+watch@chromium.org'],
     'linux_seccomp_bpf': ['jln+watch@chromium.org'],
-    'managed_users': ['pam+watch@chromium.org'],
+    'supervised_users': ['pam+watch@chromium.org'],
     'media': ['feature-media-reviews@chromium.org'],
     'media_galleries': ['gbillock@chromium.org', 'thestig@chromium.org',
                         'tommycli@chromium.org', 'vandebo@chromium.org'],
@@ -854,17 +925,17 @@
     'net': ['cbentzel+watch@chromium.org'],
     'net_error_list': ['mmenke@chromium.org'],
     'net_log': ['mmenke@chromium.org', 'eroman@chromium.org'],
+    'notifications': ['peter+watch@chromium.org'],
     'npapi_headers': ['stuartmorgan@chromium.org'],
     'ntp': ['estade+watch@chromium.org', 'dbeam+watch-ntp@chromium.org',
             'pedrosimonetti+watch@chromium.org'],
     'omnibox': ['suzhe@chromium.org'],
     'options': ['dbeam+watch-options@chromium.org'],
     'overview_mode': ['tdanderson+overview@chromium.org'],
-    'ozone': ['kalyan.kondapally@intel.com', 'ozone-reviews@chromium.org',
-              'rjkroege@chromium.org'],
+    'ozone': ['kalyan.kondapally@intel.com', 'ozone-reviews@chromium.org'],
     'panels': ['dimich@chromium.org', 'jennb@chromium.org',
                'dcheng@chromium.org', 'jianli@chromium.org'],
-    'password_manager': ['mkwst+watchlist@chromium.org',
+    'password_manager': ['mkwst+watchlist-passwords@chromium.org',
                          'gcasto+watchlist@chromium.org'],
     'pepper_api': ['piman+watch@chromium.org', 'ihf+watch@chromium.org',
                    'yusukes+watch@chromium.org', 'raymes+watch@chromium.org',
@@ -874,32 +945,33 @@
     'plugin': ['jam@chromium.org',
                'stuartmorgan+watch@chromium.org'],
     'policy_templates': ['joaodasilva+watch@chromium.org'],
-    'predictors': ['dominich+watch@chromium.org', 'shishir+watch@chromium.org'],
+    'predictors': ['shishir+watch@chromium.org'],
+    'prepopulated_engines': ['vasilii+watch@chromium.org'],
     'prerender': ['cbentzel+watch@chromium.org', 'tburkard+watch@chromium.org',
-                  'dominich+watch@chromium.org', 'gavinp+prer@chromium.org',
-                  'davidben+watch@chromium.org',],
+                  'jkarlin+watch@chromium.org', 'gavinp+prer@chromium.org',
+                  'davidben+watch@chromium.org'],
     'pyauto': ['anantha@chromium.org',
                'dyu@chromium.org',
                'dennisjeffrey@chromium.org'],
     'remoting': ['chromoting-reviews@chromium.org'],
+    'safe_browsing': ['grt+watch@chromium.org'],
     'sessions': ['marja+watch@chromium.org'],
     'service_worker': ['tzik@chromium.org',
                        'kinuko+serviceworker@chromium.org',
                        'nhiroki@chromium.org',
                        'horo+watch@chromium.org',
-                       'alecflett+watch@chromium.org',
                        'jsbell+serviceworker@chromium.org',
                        'michaeln@chromium.org',
                        'serviceworker-reviews@chromium.org'],
     'site_instance': ['creis+watch@chromium.org', 'ajwong+watch@chromium.org',
                       'nasko+codewatch@chromium.org'],
     'spellcheck': ['groby+spellwatch@chromium.org',
-                   'rlp@chromium.org',
+                   'rlp+watch@chromium.org',
                    'rouslan+spellwatch@chromium.org'],
     'streams': ['zork+watch@chromium.org'],
-    'sync': ['haitaol+watch@chromium.org',
-             'tim+watch@chromium.org',
+    'sync': ['tim+watch@chromium.org',
              'maniscalco+watch@chromium.org',
+             'pvalenzuela+watch@chromium.org',
              'zea+watch@chromium.org'],
     'syncfs': ['kinuko+fileapi@chromium.org',
                'nhiroki@chromium.org',
@@ -908,7 +980,8 @@
     'tab_capture': ['miu+watch@chromium.org'],
     'tab_contents': ['avi@chromium.org',
                      'creis+watch@chromium.org', 'ajwong+watch@chromium.org'],
-    'tcmalloc': ['dmikurube+memory@chromium.org'],
+    'tab_media_indicators': ['miu+watch@chromium.org'],
+    'tcmalloc': ['dmikurube@chromium.org'],
     'telemetry': ['telemetry+watch@chromium.org'],
     'tests': [],
     'textinput': ['penghuang+watch@chromium.org',
@@ -920,7 +993,7 @@
                            'nona+watch@chromium.org',
                            'yukishiino+watch@chromium.org'],
     'tools_emacs': ['dhollowa+watch@chromium.org'],
-    'tracing': ['dsinclair+watch@chromium.org'],
+    'tracing': ['dsinclair+watch@chromium.org', 'wfh+watch@chromium.org'],
     'ui_compositor': ['cc-bugs@chromium.org'],
     'ui_resources': ['oshima+watch@chromium.org'],
     'valgrind': ['bruening+watch@chromium.org',
@@ -929,15 +1002,15 @@
     'version_assembly': ['caitkp+watch@chromium.org',
                          'gab+watch@chromium.org'],
     'views': ['tfarina@chromium.org'],
-    'views_core': ['ben+views@chromium.org',
-                   'tdanderson+views@chromium.org'],
-    'views_corewm': ['ben+corewm@chromium.org'],
+    'views_core': ['tdanderson+views@chromium.org'],
     'virtual_keyboard': ['dfaden+virtualkb@google.com',
                          'groby+virtualkb@chromium.org'],
     'webkit': ['darin-cc@chromium.org'],
     'webrtc_media': ['wjia+watch@chromium.org',
-                     'mcasas+watch@chromium.org'],
+                     'mcasas+watch@chromium.org',
+                     'posciak+watch@chromium.org'],
     'website_settings': ['markusheintz@chromium.org'],
+    'windows_sandboxing': ['wfh+watch@chromium.org'],
     'worker': ['jam@chromium.org'],
     'x11': ['derat+watch@chromium.org',
             'sadrul@chromium.org',