update to electron 3.1.0 (#66987)

5 files changed, 54 insertions, 30 deletions

diff --git a/.yarnrc b/.yarnrc
index b32ae136d49..9e184a6f5ac 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "3.0.13"
+target "3.1.0"
 runtime "electron"
diff --git a/cgmanifest.json b/cgmanifest.json
index dc9ec2f7fcc..89693a02d32 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -48,7 +48,7 @@
 				"git": {
 					"name": "libchromiumcontent",
 					"repositoryUrl": "https://github.com/electron/libchromiumcontent",
-					"commitHash": "e38e22ed9f48e6e395f2e9faa93d2d7411f52de4"
+					"commitHash": "29e02cd4c37777734f97d00b5a538d7c7acfa67a"
 				}
 			},
 			"isOnlyProductionDependency": true,
@@ -73,12 +73,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "f26dcaeaf39e9b829aa0d4fb5a5cb59c5c314b33"
+					"commitHash": "4913fc81d1dab21f4b15c4cb682a218072447fed"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "3.0.13"
+			"version": "3.1.0"
 		},
 		{
 			"component": {
diff --git a/src/typings/electron.d.ts b/src/typings/electron.d.ts
index d7682bfa180..85ff31b320f 100644
--- a/src/typings/electron.d.ts
+++ b/src/typings/electron.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Electron 3.0.13
+// Type definitions for Electron 3.1.0
 // Project: http://electronjs.org/
 // Definitions by: The Electron Team <https://github.com/electron/electron>
 // Definitions: https://github.com/electron/electron-typescript-definitions
@@ -86,7 +86,7 @@ declare namespace Electron {
 		webviewTag: WebviewTag;
 	}
 
-  interface AllElectron extends MainInterface, RendererInterface {}
+	interface AllElectron extends MainInterface, RendererInterface { }
 
 	const app: App;
 	const autoUpdater: AutoUpdater;
@@ -2179,20 +2179,9 @@ declare namespace Electron {
 		 * Start recording on all processes. Recording begins immediately locally and
 		 * asynchronously on child processes as soon as they receive the EnableRecording
 		 * request. The callback will be called once all child processes have acknowledged
-		 * the startRecording request. categoryFilter is a filter to control what category
-		 * groups should be traced. A filter can have an optional - prefix to exclude
-		 * category groups that contain a matching category. Having both included and
-		 * excluded category patterns in the same list is not supported. Examples:
-		 * traceOptions controls what kind of tracing is enabled, it is a comma-delimited
-		 * list. Possible options are: The first 3 options are trace recording modes and
-		 * hence mutually exclusive. If more than one trace recording modes appear in the
-		 * traceOptions string, the last one takes precedence. If none of the trace
-		 * recording modes are specified, recording mode is record-until-full. The trace
-		 * option will first be reset to the default option (record_mode set to
-		 * record-until-full, enable_sampling and enable_systrace set to false) before
-		 * options parsed from traceOptions are applied on it.
-		 */
-		startRecording(options: StartRecordingOptions, callback: Function): void;
+		 * the startRecording request.
+		 */
+		startRecording(options: TraceCategoriesAndOptions | TraceConfig, callback: Function): void;
 		/**
 		 * Stop monitoring on all processes. Once all child processes have acknowledged the
 		 * stopMonitoring request the callback is called.
@@ -4102,6 +4091,7 @@ declare namespace Electron {
 		 */
 		setUserAgent(userAgent: string, acceptLanguages?: string): void;
 		cookies: Cookies;
+		netLog: NetLog;
 		protocol: Protocol;
 		webRequest: WebRequest;
 	}
@@ -4496,6 +4486,42 @@ declare namespace Electron {
 		static TouchBarSpacer: typeof TouchBarSpacer;
 	}
 
+	interface TraceCategoriesAndOptions {
+
+		// Docs: http://electron.atom.io/docs/api/structures/trace-categories-and-options
+
+		/**
+		 * – is a filter to control what category groups should be traced. A filter can
+		 * have an optional prefix to exclude category groups that contain a matching
+		 * category. Having both included and excluded category patterns in the same list
+		 * is not supported. Examples: test_MyTest*, test_MyTest*,test_OtherStuff,
+		 * -excluded_category1,-excluded_category2.
+		 */
+		categoryFilter: string;
+		/**
+		 * Controls what kind of tracing is enabled, it is a comma-delimited sequence of
+		 * the following strings: record-until-full, record-continuously, trace-to-console,
+		 * enable-sampling, enable-systrace, e.g. 'record-until-full,enable-sampling'. The
+		 * first 3 options are trace recording modes and hence mutually exclusive. If more
+		 * than one trace recording modes appear in the traceOptions string, the last one
+		 * takes precedence. If none of the trace recording modes are specified, recording
+		 * mode is record-until-full. The trace option will first be reset to the default
+		 * option (record_mode set to record-until-full, enable_sampling and
+		 * enable_systrace set to false) before options parsed from traceOptions are
+		 * applied on it.
+		 */
+		traceOptions: string;
+	}
+
+	interface TraceConfig {
+
+		// Docs: http://electron.atom.io/docs/api/structures/trace-config
+
+		excluded_categories?: string[];
+		included_categories?: string[];
+		memory_dump_config?: MemoryDumpConfig;
+	}
+
 	interface Transaction {
 
 		// Docs: http://electron.atom.io/docs/api/structures/transaction
@@ -7807,6 +7833,9 @@ declare namespace Electron {
 		args?: string[];
 	}
 
+	interface MemoryDumpConfig {
+	}
+
 	interface MenuItemConstructorOptions {
 		/**
 		 * Will be called with click(menuItem, browserWindow, event) when the menu item is
@@ -8546,11 +8575,6 @@ declare namespace Electron {
 		traceOptions: string;
 	}
 
-	interface StartRecordingOptions {
-		categoryFilter: string;
-		traceOptions: string;
-	}
-
 	interface SystemMemoryInfo {
 		/**
 		 * The total amount of physical memory in Kilobytes available to the system.
diff --git a/test/smoke/package.json b/test/smoke/package.json
index 22a960e57d1..f3c439c99a8 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -22,7 +22,7 @@
     "@types/webdriverio": "4.6.1",
     "concurrently": "^3.5.1",
     "cpx": "^1.5.0",
-    "electron": "3.0.13",
+    "electron": "3.1.0",
     "htmlparser2": "^3.9.2",
     "mkdirp": "^0.5.1",
     "mocha": "^5.2.0",
diff --git a/test/smoke/yarn.lock b/test/smoke/yarn.lock
index 0c7e15ce308..a44a612cf72 100644
--- a/test/smoke/yarn.lock
+++ b/test/smoke/yarn.lock
@@ -596,10 +596,10 @@ electron-download@^4.1.0:
     semver "^5.4.1"
     sumchecker "^2.0.2"
 
-electron@3.0.13:
-  version "3.0.13"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.13.tgz#7b065a3d130c6b6379dc78d49515e03f392c1303"
-  integrity sha512-tfx5jFgXhCmpe6oPjcesaRj7geHqQxrJdbpseanRzL9BbyYUtsj0HoxwPAUvCx4+52P6XryBwWTvne/1eBVf9Q==
+electron@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-3.1.0.tgz#5e36ba4c24926c7cf80eccf6f8361b3cad409f17"
+  integrity sha512-FnHH3T7aQGAjw5h8//9BNLZBByP/gnEGP3sQH5if7HVe6Znz5KcsRbIdxLYVH9DXJFoJ2SArP+UiAAYQIdVQJQ==
   dependencies:
     "@types/node" "^8.0.24"
     electron-download "^4.1.0"