Fix up part of 1435296-3

mozilla-release/patches/1435296-3-60a1.patch

@@ -2,7 +2,7 @@
 # User Tom Ritter <tom@mozilla.com>
 # Date 1518457181 21600
 # Node ID 312fea6ab87f732916136072f302cd53e2313da3
-# Parent  fb41d7aad48b57a13980195c6fe2084329c66576
+# Parent  031b13ca5f4d23fc8419097340c4d16842d88380
 Bug 1435296 Address test failures caused by bumping timer precision to 2 ms r=baku
 
 There are a few different reasons why tests needed updating (not an exhaustive list):
@@ -353,34 +353,30 @@ diff --git a/devtools/client/inspector/markup/test/browser_markup_mutation_02.js
  
    info("Getting the <ul.list> root node to test mutations on");
    let rootNodeFront = yield getNodeFront(".list", inspector);
-diff --git a/devtools/client/netmonitor/src/har/test/browser_net_har_copy_all_as_har.js.1435296-3.later b/devtools/client/netmonitor/src/har/test/browser_net_har_copy_all_as_har.js.1435296-3.later
-new file mode 100644
---- /dev/null
-+++ b/devtools/client/netmonitor/src/har/test/browser_net_har_copy_all_as_har.js.1435296-3.later
-@@ -0,0 +1,23 @@
-+--- browser_net_har_copy_all_as_har.js
-++++ browser_net_har_copy_all_as_har.js
-+@@ -38,18 +38,18 @@ add_task(function* () {
-+   // Check out HAR log
-+   isnot(har.log, null, "The HAR log must exist");
-+   is(har.log.creator.name, "Firefox", "The creator field must be set");
-+   is(har.log.browser.name, "Firefox", "The browser field must be set");
-+   is(har.log.pages.length, 1, "There must be one page");
-+   is(har.log.entries.length, 1, "There must be one request");
-+ 
-+   let page = har.log.pages[0];
-+-  ok(page.pageTimings.onContentLoad > 0, "There must be onContentLoad time");
-+-  ok(page.pageTimings.onLoad > 0, "There must be onLoad time");
-++  ok("onContentLoad" in page.pageTimings, "There must be onContentLoad time");
-++  ok("onLoad" in page.pageTimings, "There must be onLoad time");
-+ 
-+   let entry = har.log.entries[0];
-+   is(entry.request.method, "GET", "Check the method");
-+   is(entry.request.url, SIMPLE_URL, "Check the URL");
-+   is(entry.request.headers.length, 9, "Check number of request headers");
-+   is(entry.response.status, 200, "Check response status");
-+   is(entry.response.statusText, "OK", "Check response status text");
-+   is(entry.response.headers.length, 6, "Check number of response headers");
+diff --git a/devtools/client/netmonitor/src/har/test/browser_net_har_copy_all_as_har.js b/devtools/client/netmonitor/src/har/test/browser_net_har_copy_all_as_har.js
+--- a/devtools/client/netmonitor/src/har/test/browser_net_har_copy_all_as_har.js
++++ b/devtools/client/netmonitor/src/har/test/browser_net_har_copy_all_as_har.js
+@@ -38,18 +38,18 @@ add_task(function* () {
+   // Check out HAR log
+   isnot(har.log, null, "The HAR log must exist");
+   is(har.log.creator.name, "Firefox", "The creator field must be set");
+   is(har.log.browser.name, "Firefox", "The browser field must be set");
+   is(har.log.pages.length, 1, "There must be one page");
+   is(har.log.entries.length, 1, "There must be one request");
+ 
+   let page = har.log.pages[0];
+-  ok(page.pageTimings.onContentLoad > 0, "There must be onContentLoad time");
+-  ok(page.pageTimings.onLoad > 0, "There must be onLoad time");
++  ok("onContentLoad" in page.pageTimings, "There must be onContentLoad time");
++  ok("onLoad" in page.pageTimings, "There must be onLoad time");
+ 
+   let entry = har.log.entries[0];
+   is(entry.request.method, "GET", "Check the method");
+   is(entry.request.url, SIMPLE_URL, "Check the URL");
+   is(entry.request.headers.length, 9, "Check number of request headers");
+   is(entry.response.status, 200, "Check response status");
+   is(entry.response.statusText, "OK", "Check response status text");
+   is(entry.response.headers.length, 6, "Check number of response headers");
 diff --git a/devtools/client/netmonitor/test/browser_net_status-bar.js.1435296-3.later b/devtools/client/netmonitor/test/browser_net_status-bar.js.1435296-3.later
 new file mode 100644
 --- /dev/null