probe: Qualify #includes in generated code.

* Add "third_party/blink/renderer/" to some values in CoreProbes.json5
  and PlatformProbes.json5.

* make_instrumenting_probes.py passes a directory name relative to
  out/$config/gen/, and a template uses it to generate #includes.

Bug: 836071
Change-Id: I31ac5efaba5b96914e342d5c4f54a236b5c3fab1
Reviewed-on: https://chromium-review.googlesource.com/1025233Reviewed-by: Alexei Filippov <alph@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553351}

third_party/blink/renderer/build/scripts/make_instrumenting_probes.py

@@ -229,6 +229,12 @@ except Exception:
     sys.stderr.write("\t--output_dir <output_dir>\n")
     exit(1)
 
+match = re.search(r"\bgen[\\/]", output_dirpath)  # pylint: disable=invalid-name
+if match:
+    output_path_in_gen_dir = output_dirpath[match.end():].replace(os.path.sep, '/') + '/'  # pylint: disable=invalid-name
+else:
+    output_path_in_gen_dir = ''  # pylint: disable=invalid-name
+
 config = load_config(config_file_name)
 jinja_env = initialize_jinja_env(output_dirpath)
 base_name = os.path.splitext(os.path.basename(input_path))[0]
@@ -243,7 +249,8 @@ template_context = {
     "config": config,
     "method_name": method_name,
     "name": base_name,
-    "input_files": [os.path.basename(input_path)]
+    "input_files": [os.path.basename(input_path)],
+    "output_path_in_gen_dir": output_path_in_gen_dir
 }
 
 template_context["template_file"] = "/InstrumentingProbesImpl.cpp.tmpl"

third_party/blink/renderer/build/scripts/templates/InstrumentingProbesImpl.cpp.tmpl

@@ -5,16 +5,15 @@
 {% from 'macros.tmpl' import source_files_for_generated_file %}
 {{source_files_for_generated_file(template_file, input_files)}}
 
-#include "third_party/blink/renderer/platform/wtf/threading_primitives.h"
-
 {% set sink_class = (name | to_singular) + "Sink" %}
 {% for file in files %}
-#include "{{file.name}}Inl.h"
+#include "{{output_path_in_gen_dir}}{{file.name}}Inl.h"
 {% endfor %}
-#include "{{sink_class}}.h"
+#include "{{output_path_in_gen_dir}}{{sink_class}}.h"
 {% for agent in agents %}
 #include "{{agent | agent_name_to_include}}"
 {% endfor %}
+#include "third_party/blink/renderer/platform/wtf/threading_primitives.h"
 
 namespace blink {
 

third_party/blink/renderer/core/probe/CoreProbes.json5

 {
   settings: {
-    export_header: "core/core_export.h",
+    export_header: "third_party/blink/renderer/core/core_export.h",
     export_symbol: "CORE_EXPORT",
-    include_path: "core/inspector",
+    include_path: "third_party/blink/renderer/core/inspector",
     includes: [
-      "core/CoreProbeSink.h",
-      "core/probe/core_probes.h",
+      "third_party/blink/renderer/core/CoreProbeSink.h",
+      "third_party/blink/renderer/core/probe/core_probes.h",
     ],
   },
   observers: {
     AdTracker: {
       class: "AdTracker",
-      include_path: "core/frame",
+      include_path: "third_party/blink/renderer/core/frame",
       probes: [
         "CallFunction",
         "ExecuteScript",
@@ -168,7 +168,7 @@
     },
     Performance: {
       class: "PerformanceMonitor",
-      include_path: "core/frame",
+      include_path: "third_party/blink/renderer/core/frame",
       probes: [
         "CallFunction",
         "ExecuteScript",

third_party/blink/renderer/platform/probe/PlatformProbes.json5

 {
   settings: {
-    export_header: "platform/platform_export.h",
+    export_header: "third_party/blink/renderer/platform/platform_export.h",
     export_symbol: "PLATFORM_EXPORT",
-    include_path: "platform/probe",
+    include_path: "third_party/blink/renderer/platform/probe",
     includes: [
-      "platform/PlatformProbeSink.h",
-      "platform/probe/platform_probes.h",
+      "third_party/blink/renderer/platform/PlatformProbeSink.h",
+      "third_party/blink/renderer/platform/probe/platform_probes.h",
     ]
   },
   observers: {