From 8eb390b8f5946d15731f989400acbfb1bc61f46e Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Wed, 15 Nov 2017 08:57:58 +0100
Subject: [PATCH] Bug 1404400 - Delete browser_webconsole_charset.js from new
 frontend;r=Honza.

This test was checking the HTTPinspector by directly calling a WebConsoleClient function
which is no longer used in console code.

MozReview-Commit-ID: LxjhhO2rB0W

--HG--
extra : rebase_source : 411c18a62ae97102907b35f5d5e26749b48047f5
---
 .../test/mochitest/browser.ini                |  4 --
 .../mochitest/browser_webconsole_charset.js   | 61 -------------------
 .../mochitest/test-bug-600183-charset.html    |  9 ---
 .../test-bug-600183-charset.html^headers^     |  1 -
 4 files changed, 75 deletions(-)
 delete mode 100644 devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_charset.js
 delete mode 100644 devtools/client/webconsole/new-console-output/test/mochitest/test-bug-600183-charset.html
 delete mode 100644 devtools/client/webconsole/new-console-output/test/mochitest/test-bug-600183-charset.html^headers^

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
index 4b03788a7220..e53b078d9c97 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -56,8 +56,6 @@ support-files =
   test-bug-597136-external-script-errors.js
   test-bug-597756-reopen-closed-tab.html
   test-bug-599725-response-headers.sjs
-  test-bug-600183-charset.html
-  test-bug-600183-charset.html^headers^
   test-bug-601177-log-levels.html
   test-bug-601177-log-levels.js
   test-bug-603750-websocket.html
@@ -231,8 +229,6 @@ tags = mcb
 [browser_webconsole_cached_messages.js]
 [browser_webconsole_cd_iframe.js]
 [browser_webconsole_certificate_messages.js]
-[browser_webconsole_charset.js]
-skip-if = true #	Bug 1404400
 [browser_webconsole_click_function_to_source.js]
 skip-if = true #	Bug 1406038
 [browser_webconsole_clickable_urls.js]
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_charset.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_charset.js
deleted file mode 100644
index da68618be005..000000000000
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_charset.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-// See Bug 600183.
-
-const INIT_URI = "data:text/html;charset=utf-8,Web Console - bug 600183 test";
-const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "test/test-bug-600183-charset.html";
-
-function performTest(lastFinishedRequest, console) {
-  let deferred = defer();
-
-  ok(lastFinishedRequest, "charset test page was loaded and logged");
-  HUDService.lastFinishedRequest.callback = null;
-
-  executeSoon(() => {
-    console.webConsoleClient.getResponseContent(lastFinishedRequest.actor,
-      (response) => {
-        ok(!response.contentDiscarded, "response body was not discarded");
-
-        let body = response.content.text;
-        ok(body, "we have the response body");
-
-        // 的问候!
-        let chars = "\u7684\u95ee\u5019!";
-        isnot(body.indexOf("<p>" + chars + "</p>"), -1,
-          "found the chinese simplified string");
-
-        HUDService.lastFinishedRequest.callback = null;
-        executeSoon(deferred.resolve);
-      });
-  });
-
-  return deferred.promise;
-}
-
-function waitForRequest() {
-  let deferred = defer();
-  HUDService.lastFinishedRequest.callback = (req, console) => {
-    performTest(req, console).then(deferred.resolve);
-  };
-  return deferred.promise;
-}
-
-add_task(function* () {
-  let { browser } = yield loadTab(INIT_URI);
-
-  yield openConsole();
-
-  let gotLastRequest = waitForRequest();
-
-  let loaded = loadBrowser(browser);
-  BrowserTestUtils.loadURI(browser, TEST_URI);
-  yield loaded;
-
-  yield gotLastRequest;
-});
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-600183-charset.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-600183-charset.html
deleted file mode 100644
index 040490a6b0f1..000000000000
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-600183-charset.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML>
-<html dir="ltr" xml:lang="en-US" lang="en-US"><head>
-    <meta charset="gb2312">
-    <title>Console HTTP test page (chinese)</title>
-  </head>
-  <body>
-    <p>µÄÎʺò!</p>
-  </body>
-</html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-600183-charset.html^headers^ b/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-600183-charset.html^headers^
deleted file mode 100644
index 9f3e2302f5d1..000000000000
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-600183-charset.html^headers^
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/html; charset=gb2312