From 3d5437e0a45b884d850ff125d38c0c49edc4d86f Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Fri, 13 Nov 2015 02:36:38 +0530
Subject: [PATCH] tracing: fix docs and allow null values in file path
 conversion fromv8

---
 atom/common/native_mate_converters/file_path_converter.h | 3 +++
 docs/api/content-tracing.md                              | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/atom/common/native_mate_converters/file_path_converter.h b/atom/common/native_mate_converters/file_path_converter.h
index 468f506de8a3..7df1289e243b 100644
--- a/atom/common/native_mate_converters/file_path_converter.h
+++ b/atom/common/native_mate_converters/file_path_converter.h
@@ -21,6 +21,9 @@ struct Converter<base::FilePath> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
                      base::FilePath* out) {
+    if (val->IsNull())
+      return true;
+
     base::FilePath::StringType path;
     if (Converter<base::FilePath::StringType>::FromV8(isolate, val, &path)) {
       *out = base::FilePath(path);
diff --git a/docs/api/content-tracing.md b/docs/api/content-tracing.md
index 2e05fc67668f..9fc335b3bc18 100644
--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -6,9 +6,14 @@ so you need to open `chrome://tracing/` in a Chrome browser and load the
 generated file to view the result.
 
 ```javascript
-var contentTracing = require('content-tracing');
+const contentTracing = require('content-tracing');
 
-contentTracing.startRecording('*', contentTracing.DEFAULT_OPTIONS, function() {
+const options = {
+  categoryFilter: '*',
+  traceOptions: 'record-until-full,enable-sampling'
+}
+
+contentTracing.startRecording(options, function() {
   console.log('Tracing started');
 
   setTimeout(function() {