Bug 1413540 - Merge 'flash' filter into 'Others'. r=Honza

MozReview-Commit-ID: CjxepUwYHr0

--HG--
extra : rebase_source : 17fca44728967a6dda307a2640bbd3d479d04302

devtools/client/netmonitor/src/components/StatisticsPanel.js

@@ -208,19 +208,16 @@ class StatisticsPanel extends Component {
       } else if (Filters.media(request)) {
         // "media"
         type = 6;
-      } else if (Filters.flash(request)) {
-        // "flash"
-        type = 7;
       } else if (Filters.ws(request)) {
         // "ws"
-        type = 8;
+        type = 7;
       } else if (Filters.xhr(request)) {
         // Verify XHR last, to categorize other mime types in their own blobs.
         // "xhr"
         type = 3;
       } else {
         // "other"
-        type = 9;
+        type = 8;
       }
 
       if (emptyCache || !this.responseIsFresh(request)) {

devtools/client/netmonitor/src/constants.js

@@ -275,7 +275,6 @@ const FILTER_TAGS = [
   "fonts",
   "images",
   "media",
-  "flash",
   "ws",
   "other",
 ];

devtools/client/netmonitor/src/utils/filter-predicates.js

@@ -61,15 +61,6 @@ function isMedia({ mimeType }) {
     mimeType.includes("model/"));
 }
 
-function isFlash({ url, mimeType }) {
-  // Flash is a mess.
-  return (mimeType && (
-      mimeType.includes("/x-flv") ||
-      mimeType.includes("/x-shockwave-flash"))) ||
-    url.includes(".swf") ||
-    url.includes(".flv");
-}
-
 function isWS({ requestHeaders, responseHeaders }) {
   // Detect a websocket upgrade if request has an Upgrade header with value 'websocket'
   if (!requestHeaders || !Array.isArray(requestHeaders.headers)) {
@@ -100,7 +91,7 @@ function isWS({ requestHeaders, responseHeaders }) {
 }
 
 function isOther(item) {
-  let tests = [isHtml, isCss, isJs, isXHR, isFont, isImage, isMedia, isFlash, isWS];
+  let tests = [isHtml, isCss, isJs, isXHR, isFont, isImage, isMedia, isWS];
   return tests.every(is => !is(item));
 }
 
@@ -114,7 +105,6 @@ module.exports = {
     fonts: isFont,
     images: isImage,
     media: isMedia,
-    flash: isFlash,
     ws: isWS,
     other: isOther,
   },

devtools/client/netmonitor/test/browser_net_filter-01.js

@@ -213,13 +213,6 @@ add_task(function* () {
   testFilterButtons(monitor, "media");
   yield testContents([0, 0, 0, 0, 0, 1, 1, 0, 0]);
 
-  EventUtils.sendMouseEvent({ type: "click" },
-    document.querySelector(".requests-list-filter-all-button"));
-  EventUtils.sendMouseEvent({ type: "click" },
-    document.querySelector(".requests-list-filter-flash-button"));
-  testFilterButtons(monitor, "flash");
-  yield testContents([0, 0, 0, 0, 0, 0, 0, 1, 0]);
-
   EventUtils.sendMouseEvent({ type: "click" },
     document.querySelector(".requests-list-filter-all-button"));
   EventUtils.sendMouseEvent({ type: "click" },
@@ -265,25 +258,20 @@ add_task(function* () {
     document.querySelector(".requests-list-filter-html-button"));
   EventUtils.sendMouseEvent({ type: "click" },
     document.querySelector(".requests-list-filter-css-button"));
-  testFilterButtonsCustom(monitor, [0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0]);
+  testFilterButtonsCustom(monitor, [0, 1, 1, 0, 0, 0, 0, 0, 0, 0]);
   yield testContents([1, 1, 0, 0, 0, 0, 0, 0, 0]);
 
   // Html and css filter enabled and text filter should show just the html and css match.
   // Should not show both the items matching the button plus the items matching the text.
   setFreetextFilter("sample");
   yield testContents([1, 1, 0, 0, 0, 0, 0, 0, 0]);
-
-  EventUtils.sendMouseEvent({ type: "click" },
-    document.querySelector(".requests-list-filter-flash-button"));
   setFreetextFilter("");
-  testFilterButtonsCustom(monitor, [0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0]);
-  yield testContents([1, 1, 0, 0, 0, 0, 0, 1, 0]);
+  testFilterButtonsCustom(monitor, [0, 1, 1, 0, 0, 0, 0, 0, 0, 0]);
+  yield testContents([1, 1, 0, 0, 0, 0, 0, 0, 0]);
 
   // Disable some filters. Only one left active.
   EventUtils.sendMouseEvent({ type: "click" },
     document.querySelector(".requests-list-filter-css-button"));
-  EventUtils.sendMouseEvent({ type: "click" },
-    document.querySelector(".requests-list-filter-flash-button"));
   testFilterButtons(monitor, "html");
   yield testContents([1, 0, 0, 0, 0, 0, 0, 0, 0]);
 
@@ -300,7 +288,7 @@ add_task(function* () {
     document.querySelector(".requests-list-filter-css-button"));
   EventUtils.sendMouseEvent({ type: "click" },
     document.querySelector(".requests-list-filter-ws-button"));
-  testFilterButtonsCustom(monitor, [0, 1, 1, 0, 0, 0, 0, 0, 0, 1]);
+  testFilterButtonsCustom(monitor, [0, 1, 1, 0, 0, 0, 0, 0, 1, 0]);
   EventUtils.sendMouseEvent({ type: "click" },
     document.querySelector(".requests-list-filter-all-button"));
   testFilterButtons(monitor, "all");

devtools/client/netmonitor/test/browser_net_footer-summary.js

@@ -38,7 +38,7 @@ add_task(function* () {
 
     testStatus();
 
-    let buttons = ["html", "css", "js", "xhr", "fonts", "images", "media", "flash"];
+    let buttons = ["html", "css", "js", "xhr", "fonts", "images", "media"];
     for (let button of buttons) {
       let buttonEl = document.querySelector(`.requests-list-filter-${button}-button`);
       EventUtils.sendMouseEvent({ type: "click" }, buttonEl);

devtools/client/netmonitor/test/browser_net_statistics-02.js

@@ -26,7 +26,7 @@ add_task(function* () {
     document.querySelector(".requests-list-filter-ws-button"));
   EventUtils.sendMouseEvent({ type: "click" },
     document.querySelector(".requests-list-filter-other-button"));
-  testFilterButtonsCustom(monitor, [0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1]);
+  testFilterButtonsCustom(monitor, [0, 1, 1, 1, 0, 0, 0, 0, 1, 1]);
   info("The correct filtering predicates are used before entering perf. analysis mode.");
 
   store.dispatch(Actions.openStatistics(connector, true));