From 27904887cf5a9b49aa574df436279c32c3fc3ca9 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Thu, 13 Aug 2015 08:58:09 -0700
Subject: [PATCH] Backed out changeset 692b2fea4ef6 (bug 1161698) because it
 was the wrong patch

---
 .../test/browser_perf_recordings-io-01.js     | 20 +++++++++----------
 toolkit/devtools/performance/io.js            |  4 ----
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/browser/devtools/performance/test/browser_perf_recordings-io-01.js b/browser/devtools/performance/test/browser_perf_recordings-io-01.js
index 9a8f8d2c331f..2faa1a7f01c5 100644
--- a/browser/devtools/performance/test/browser_perf_recordings-io-01.js
+++ b/browser/devtools/performance/test/browser_perf_recordings-io-01.js
@@ -61,24 +61,24 @@ let test = Task.async(function*() {
 
   let importedData = PerformanceController.getCurrentRecording().getAllData();
 
-  is(importedData.label, "tmpprofile",
-    "The label is identical to the filename without its extension.");
-  is(importedData.duration, originalData.duration,
+  is(importedData.label, originalData.label,
     "The imported data is identical to the original data (1).");
-  is(importedData.markers.toSource(), originalData.markers.toSource(),
+  is(importedData.duration, originalData.duration,
     "The imported data is identical to the original data (2).");
-  is(importedData.memory.toSource(), originalData.memory.toSource(),
+  is(importedData.markers.toSource(), originalData.markers.toSource(),
     "The imported data is identical to the original data (3).");
-  is(importedData.ticks.toSource(), originalData.ticks.toSource(),
+  is(importedData.memory.toSource(), originalData.memory.toSource(),
     "The imported data is identical to the original data (4).");
-  is(importedData.allocations.toSource(), originalData.allocations.toSource(),
+  is(importedData.ticks.toSource(), originalData.ticks.toSource(),
     "The imported data is identical to the original data (5).");
-  is(importedData.profile.toSource(), originalData.profile.toSource(),
+  is(importedData.allocations.toSource(), originalData.allocations.toSource(),
     "The imported data is identical to the original data (6).");
-  is(importedData.configuration.withTicks, originalData.configuration.withTicks,
+  is(importedData.profile.toSource(), originalData.profile.toSource(),
     "The imported data is identical to the original data (7).");
-  is(importedData.configuration.withMemory, originalData.configuration.withMemory,
+  is(importedData.configuration.withTicks, originalData.configuration.withTicks,
     "The imported data is identical to the original data (8).");
+  is(importedData.configuration.withMemory, originalData.configuration.withMemory,
+    "The imported data is identical to the original data (9).");
 
   yield teardown(panel);
   finish();
diff --git a/toolkit/devtools/performance/io.js b/toolkit/devtools/performance/io.js
index ab30a8bf802f..32dd2e5d48e8 100644
--- a/toolkit/devtools/performance/io.js
+++ b/toolkit/devtools/performance/io.js
@@ -104,10 +104,6 @@ function loadRecordingFromFile (file) {
     if (recordingData.profile.meta.version === 2) {
       RecordingUtils.deflateProfile(recordingData.profile);
     }
-    if(!recordingData.label) {
-      // set it to the filename without its extension
-      recordingData.label = file.leafName.replace(/\..+$/, '');
-    }
     deferred.resolve(recordingData);
   });