DevTools: merge browser_protocol.json files from content and core/inspector.

third_party/WebKit/Source/devtools/PRESUBMIT.py

Index: third_party/WebKit/Source/devtools/PRESUBMIT.py
diff --git a/third_party/WebKit/Source/devtools/PRESUBMIT.py b/third_party/WebKit/Source/devtools/PRESUBMIT.py
index f74063724c532a90b8fe454df280bd34fbbc81f0..48c11e130a01d50d1cee2a88b2f54556c5aaf8a3 100644
--- a/third_party/WebKit/Source/devtools/PRESUBMIT.py
+++ b/third_party/WebKit/Source/devtools/PRESUBMIT.py
@@ -69,10 +69,10 @@ def _CompileDevtoolsFrontend(input_api, output_api):
     # should be added to the list of triggers.
     devtools_front_end = input_api.os_path.join("devtools", "front_end")
     if (any(devtools_front_end in path for path in local_paths) or
-        any("protocol.json" in path for path in local_paths) or
-        any("compile_frontend.py" in path for path in local_paths) or
-        any("InjectedScriptSource.js" in path for path in local_paths) or
-        any("DebuggerScript.js" in path for path in local_paths)):
+            any("_protocol.json" in path for path in local_paths) or
+            any("compile_frontend.py" in path for path in local_paths) or
+            any("InjectedScriptSource.js" in path for path in local_paths) or
+            any("DebuggerScript.js" in path for path in local_paths)):
         lint_path = input_api.os_path.join(input_api.PresubmitLocalPath(),
             "scripts", "compile_frontend.py")
         out, _ = input_api.subprocess.Popen(