diff options
| author | Ben Murdoch <benm@google.com> | 2014-03-31 11:51:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-03-31 11:51:25 +0100 |
| commit | effb81e5f8246d0db0270817048dc992db66e9fb (patch) | |
| tree | cc45ced7dfde038c8f3d022ee1eeac207a68761e /PRESUBMIT.py | |
| parent | 4d26337013537c1acafbcb63b9b2b7e404c3adc9 (diff) | |
| download | chromium_org-effb81e5f8246d0db0270817048dc992db66e9fb.tar.gz | |
Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
Diffstat (limited to 'PRESUBMIT.py')
| -rw-r--r-- | PRESUBMIT.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 326178cb11..8c272660c2 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -61,8 +61,7 @@ _TEST_ONLY_WARNING = ( 'You might be calling functions intended only for testing from\n' 'production code. It is OK to ignore this warning if you know what\n' 'you are doing, as the heuristics used to detect the situation are\n' - 'not perfect. The commit queue will not block on this warning.\n' - 'Email joi@chromium.org if you have questions.') + 'not perfect. The commit queue will not block on this warning.') _INCLUDE_ORDER_WARNING = ( @@ -170,6 +169,7 @@ _BANNED_CPP_FUNCTIONS = ( r"^components[\\\/]breakpad[\\\/]app[\\\/]breakpad_mac\.mm$", r"^content[\\\/]shell[\\\/]browser[\\\/]shell_browser_main\.cc$", r"^content[\\\/]shell[\\\/]browser[\\\/]shell_message_filter\.cc$", + r"^mojo[\\\/]system[\\\/]raw_shared_buffer_posix\.cc$", r"^net[\\\/]disk_cache[\\\/]cache_util\.cc$", ), ), @@ -759,7 +759,7 @@ def _CheckHardcodedGoogleHostsInLowerLayers(input_api, output_api): if problems: return [output_api.PresubmitPromptOrNotify( 'Most layers below src/chrome/ should not hardcode service URLs.\n' - 'Are you sure this is correct? (Contact: joi@chromium.org)', + 'Are you sure this is correct?', [' %s:%d: %s' % ( problem[0], problem[1], problem[2]) for problem in problems])] else: @@ -905,6 +905,7 @@ def _CheckSpamLogging(input_api, output_api): r"logging_native_handler\.cc$", r"^content[\\\/]common[\\\/]gpu[\\\/]client[\\\/]" r"gl_helper_benchmark\.cc$", + r"^native_client_sdk[\\\/]", r"^remoting[\\\/]base[\\\/]logging\.h$", r"^remoting[\\\/]host[\\\/].*", r"^sandbox[\\\/]linux[\\\/].*", |