author Alexandre Lissy <lissyx@lissyx.dyndns.org>

Wed, 16 Mar 2016 17:11:12 +0100

changeset 385370 34fbf026e29199500d37f2f36b32e7d029b0c395

parent 385002 4764b9f8e6d4ef9823237f01ca3901759ce8daeb

child 524915 33d4b119c8755f1a74c5b6a65c711e8eaa773cd5

push id 22489

push user bmo:lissyx+mozillians@lissyx.dyndns.org

push date Fri, 08 Jul 2016 08:29:07 +0000

reviewers valentin

bugs 1285170

milestone 50.0a1

addon-sdk/source/test/test-url.js file | annotate | diff | comparison | revisions

devtools/client/performance/test/unit/test_frame-utils-01.js file | annotate | diff | comparison | revisions

devtools/shared/apps/moz.build file | annotate | diff | comparison | revisions

devtools/shared/apps/tests/unit/.eslintrc file | annotate | diff | comparison | revisions

devtools/shared/apps/tests/unit/data/app-engineering.zip file | annotate | diff | comparison | revisions

devtools/shared/apps/tests/unit/data/app.zip file | annotate | diff | comparison | revisions

devtools/shared/apps/tests/unit/head_apps.js file | annotate | diff | comparison | revisions

devtools/shared/apps/tests/unit/tail_apps.js file | annotate | diff | comparison | revisions

devtools/shared/apps/tests/unit/test_webappsActor.js file | annotate | diff | comparison | revisions

devtools/shared/apps/tests/unit/xpcshell.ini file | annotate | diff | comparison | revisions

dom/indexedDB/test/unit/defaultStorageUpgrade_profile.zip file | annotate | diff | comparison | revisions

dom/indexedDB/test/unit/idbSubdirUpgrade1_profile.zip file | annotate | diff | comparison | revisions

dom/indexedDB/test/unit/idbSubdirUpgrade2_profile.zip file | annotate | diff | comparison | revisions

dom/indexedDB/test/unit/schema23upgrade_profile.zip file | annotate | diff | comparison | revisions

dom/indexedDB/test/unit/storagePersistentUpgrade_profile.zip file | annotate | diff | comparison | revisions

dom/indexedDB/test/unit/test_defaultStorageUpgrade.js file | annotate | diff | comparison | revisions

dom/indexedDB/test/unit/test_idbSubdirUpgrade.js file | annotate | diff | comparison | revisions

dom/indexedDB/test/unit/test_schema23upgrade.js file | annotate | diff | comparison | revisions

dom/indexedDB/test/unit/test_storagePersistentUpgrade.js file | annotate | diff | comparison | revisions

netwerk/build/moz.build file | annotate | diff | comparison | revisions

netwerk/build/nsNetCID.h file | annotate | diff | comparison | revisions

netwerk/build/nsNetModule.cpp file | annotate | diff | comparison | revisions

netwerk/ipc/NeckoParent.cpp file | annotate | diff | comparison | revisions

netwerk/ipc/NeckoParent.h file | annotate | diff | comparison | revisions

netwerk/protocol/app/AppProtocolHandler.cpp file | annotate | diff | comparison | revisions

netwerk/protocol/app/AppProtocolHandler.h file | annotate | diff | comparison | revisions

netwerk/protocol/app/moz.build file | annotate | diff | comparison | revisions

old-configure.in file | annotate | diff | comparison | revisions
--- a/addon-sdk/source/test/test-url.js
+++ b/addon-sdk/source/test/test-url.js
@@ -391,17 +391,17 @@ exports.testLocalURLwithInvalidURL = fun
   ]).forEach(aUri => {
     assert.ok(!isLocalURL(aUri), aUri + ' is an invalid Local URL');
   });
 }
 
 exports.testFileName = function(assert) {
   let urls = [
     ['https://foo/bar.js', 'bar.js'],
-    ['app://myfxosapp/file.js', 'file.js'],
+    ['chrome://gaia/content/myfxosapp/file.js', 'file.js'],
     ['http://localhost:8888/file.js', 'file.js'],
     ['http://foo/bar.js#hash', 'bar.js'],
     ['http://foo/bar.js?q=go&query=yeah', 'bar.js'],
     ['chrome://browser/content/content.js', 'content.js'],
     ['resource://gre/foo.js', 'foo.js'],
   ];
 
   urls.forEach(([url, fileName]) => assert.equal(URL(url).fileName, fileName, 'file names are equal'));
--- a/devtools/client/performance/test/unit/test_frame-utils-01.js
+++ b/devtools/client/performance/test/unit/test_frame-utils-01.js
@@ -9,17 +9,16 @@
 const CONTENT_LOCATIONS = [
   "hello/<.world (https://foo/bar.js:123:987)",
   "hello/<.world (http://foo/bar.js:123:987)",
   "hello/<.world (http://foo/bar.js:123)",
   "hello/<.world (http://foo/bar.js#baz:123:987)",
   "hello/<.world (http://foo/bar.js?myquery=params&search=1:123:987)",
   "hello/<.world (http://foo/#bar:123:987)",
   "hello/<.world (http://foo/:123:987)",
-  "hello/<.world (app://myfxosapp/file.js:100:1)",
 
   // Test scripts with port numbers (bug 1164131)
   "hello/<.world (http://localhost:8888/file.js:100:1)",
   "hello/<.world (http://localhost:8888/file.js:100)",
 
   // Eval
   "hello/<.world (http://localhost:8888/file.js line 65 > eval:1)",
 
@@ -67,17 +66,16 @@ add_task(function () {
   const PARSED_CONTENT = [
     ["hello/<.world", "bar.js", "foo", "https://foo/bar.js", 123, 987, "foo", null],
     ["hello/<.world", "bar.js", "foo", "http://foo/bar.js", 123, 987, "foo", null],
     ["hello/<.world", "bar.js", "foo", "http://foo/bar.js", 123, null, "foo", null],
     ["hello/<.world", "bar.js", "foo", "http://foo/bar.js#baz", 123, 987, "foo", null],
     ["hello/<.world", "bar.js", "foo", "http://foo/bar.js?myquery=params&search=1", 123, 987, "foo", null],
     ["hello/<.world", "/", "foo", "http://foo/#bar", 123, 987, "foo", null],
     ["hello/<.world", "/", "foo", "http://foo/", 123, 987, "foo", null],
-    ["hello/<.world", "file.js", "myfxosapp", "app://myfxosapp/file.js", 100, 1, "myfxosapp", null],
     ["hello/<.world", "file.js", "localhost:8888", "http://localhost:8888/file.js", 100, 1, "localhost:8888", 8888],
     ["hello/<.world", "file.js", "localhost:8888", "http://localhost:8888/file.js", 100, null, "localhost:8888", 8888],
     ["hello/<.world", "file.js (eval:1)", "localhost:8888", "http://localhost:8888/file.js", 65, null, "localhost:8888", 8888],
     ["hello/<.world", "/", "localhost:8888", "http://localhost:8888/", 1, null, "localhost:8888", 8888],
     ["hello/<.world", "/", "localhost:8888", "http://localhost:8888/", 100, 50, "localhost:8888", 8888],
     ["Native[\"arraycopy(blah)\"]", "profiler.html", "localhost:8888", "http://localhost:8888/profiler.html", 4, null, "localhost:8888", 8888],
     ["Native[\"arraycopy(blah)\"]", "profiler.html", "localhost:8888", "http://localhost:8888/profiler.html", 4, 5, "localhost:8888", 8888],
   ];
--- a/devtools/shared/apps/moz.build
+++ b/devtools/shared/apps/moz.build
@@ -11,15 +11,13 @@ TEST_HARNESS_FILES.testing.mochitest.tes
     'tests/data/app-certified.zip',
     'tests/data/app-overload.zip',
     'tests/data/app-redirect.zip',
     'tests/data/app-system.zip',
     'tests/data/app-updated.zip',
     'tests/data/app.zip',
 ]
 
-XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
-
 DevToolsModules(
     'app-actor-front.js',
     'Devices.jsm',
     'Simulator.jsm'
 )
deleted file mode 100644
--- a/devtools/shared/apps/tests/unit/.eslintrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  // Extend from the common devtools xpcshell eslintrc config.
-  "extends": "../../../../.eslintrc.xpcshell"
-}
\ No newline at end of file
deleted file mode 100644
--- a/devtools/shared/apps/tests/unit/head_apps.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-var Ci = Components.interfaces;
-var Cu = Components.utils;
-var Cr = Components.results;
-
-const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
-const Services = require("Services");
-const {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm");
-const {FileUtils} = require("resource://gre/modules/FileUtils.jsm");
-const {DebuggerClient} = require("devtools/shared/client/main");
-const {DebuggerServer} = require("devtools/server/main");
-const {AppActorFront} = require("devtools/shared/apps/app-actor-front");
-
-var gClient, gActor, gActorFront;
-
-function connect(onDone) {
-  // Initialize a loopback remote protocol connection
-  DebuggerServer.init();
-  // We need to register browser actors to have `listTabs` working
-  // and also have a root actor
-  DebuggerServer.addBrowserActors();
-
-  // Setup client and actor used in all tests
-  gClient = new DebuggerClient(DebuggerServer.connectPipe());
-  gClient.connect()
-    .then(() => gClient.listTabs())
-    .then(aResponse => {
-      gActor = aResponse.webappsActor;
-      gActorFront = new AppActorFront(gClient, aResponse);
-      onDone();
-    });
-}
-
-function webappActorRequest(request, onResponse) {
-  if (!gActor) {
-    connect(webappActorRequest.bind(null, request, onResponse));
-    return;
-  }
-
-  request.to = gActor;
-  gClient.request(request, onResponse);
-}
-
-// Install a test packaged webapp from data folder
-function installTestApp(zipName, appId, onDone) {
-  // Copy our package to tmp folder, where the actor retrieves it
-  let zip = do_get_file("data/" + zipName);
-  let appDir = FileUtils.getDir("TmpD", ["b2g", appId], true, true);
-  zip.copyTo(appDir, "application.zip");
-
-  let request = {type: "install", appId: appId};
-  webappActorRequest(request, function (aResponse) {
-    do_check_eq(aResponse.appId, appId);
-    if ("error" in aResponse) {
-      do_throw("Error: " + aResponse.error);
-    }
-    if ("message" in aResponse) {
-      do_throw("Error message: " + aResponse.message);
-    }
-    do_check_false("error" in aResponse);
-
-    onDone();
-  });
-}
-
-function setup() {
-  // We have to setup a profile, otherwise indexed db used by webapps
-  // will throw random exception when trying to get profile folder
-  do_get_profile();
-
-  // The webapps dir isn't registered on b2g xpcshell tests,
-  // we have to manually set it to the directory service.
-  do_get_webappsdir();
-
-  // We also need a valid nsIXulAppInfo service as Webapps.jsm is querying it
-  Components.utils.import("resource://testing-common/AppInfo.jsm");
-  updateAppInfo();
-
-  Components.utils.import("resource://gre/modules/Webapps.jsm");
-
-  // Enable launch/close method of the webapps actor
-  let {WebappsActor} = require("devtools/server/actors/webapps");
-  WebappsActor.prototype.supportsLaunch = true;
-}
-
-function do_get_webappsdir() {
-  var webappsDir = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
-  webappsDir.append("test_webapps");
-  if (!webappsDir.exists())
-    webappsDir.create(Ci.nsIFile.DIRECTORY_TYPE, parseInt("755", 8));
-
-  var coreAppsDir = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
-  coreAppsDir.append("test_coreapps");
-  if (!coreAppsDir.exists())
-    coreAppsDir.create(Ci.nsIFile.DIRECTORY_TYPE, parseInt("755", 8));
-
-  // Register our own provider for the profile directory.
-  // It will return our special docshell profile directory.
-  var provider = {
-    getFile: function (prop, persistent) {
-      persistent.value = true;
-      if (prop == "webappsDir") {
-        return webappsDir.clone();
-      }
-      else if (prop == "coreAppsDir") {
-        return coreAppsDir.clone();
-      }
-      throw Cr.NS_ERROR_FAILURE;
-    },
-    QueryInterface: function (iid) {
-      if (iid.equals(Ci.nsIDirectoryServiceProvider) ||
-          iid.equals(Ci.nsISupports)) {
-        return this;
-      }
-      throw Cr.NS_ERROR_NO_INTERFACE;
-    }
-  };
-  Services.dirsvc.QueryInterface(Ci.nsIDirectoryService).registerProvider(provider);
-}
deleted file mode 100644
--- a/devtools/shared/apps/tests/unit/tail_apps.js
+++ /dev/null
@@ -1,6 +0,0 @@
-if (gClient) {
-  // Close the test remote connection before leaving this test
-  gClient.close(function () {
-    run_next_test();
-  });
-}
deleted file mode 100644
--- a/devtools/shared/apps/tests/unit/test_webappsActor.js
+++ /dev/null
@@ -1,311 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const promise = require("promise");
-const defer = require("devtools/shared/defer");
-
-var gAppId = "actor-test";
-const APP_ORIGIN = "app://" + gAppId;
-
-add_test(function testLaunchInexistantApp() {
-  let request = {type: "launch", manifestURL: "http://foo.com"};
-  webappActorRequest(request, function (aResponse) {
-    do_check_eq(aResponse.error, "NO_SUCH_APP");
-    run_next_test();
-  });
-});
-
-add_test(function testCloseInexistantApp() {
-  let request = {type: "close", manifestURL: "http://foo.com"};
-  webappActorRequest(request, function (aResponse) {
-    do_check_eq(aResponse.error, "missingParameter");
-    do_check_eq(aResponse.message, "No application for http://foo.com");
-    run_next_test();
-  });
-});
-
-// Install a test app
-add_test(function testInstallPackaged() {
-  installTestApp("app.zip", gAppId, function () {
-    run_next_test();
-  });
-});
-
-// Now check that the app appear in getAll
-add_test(function testGetAll() {
-  let request = {type: "getAll"};
-  webappActorRequest(request, function (aResponse) {
-    do_check_true("apps" in aResponse);
-    let apps = aResponse.apps;
-    do_check_true(apps.length > 0);
-    for (let i = 0; i < apps.length; i++) {
-      let app = apps[i];
-      if (app.id == gAppId) {
-        do_check_eq(app.name, "Test app");
-        do_check_eq(app.manifest.description, "Testing webapps actor");
-        do_check_eq(app.manifest.launch_path, "/index.html");
-        do_check_eq(app.origin, APP_ORIGIN);
-        do_check_eq(app.installOrigin, app.origin);
-        do_check_eq(app.manifestURL, app.origin + "/manifest.webapp");
-        do_check_eq(app.csp, "script-src: http://foo.com");
-        run_next_test();
-        return;
-      }
-    }
-    do_throw("Unable to find the test app by its id");
-  });
-});
-
-add_test(function testGetApp() {
-  let manifestURL = APP_ORIGIN + "/manifest.webapp";
-  let request = {type: "getApp", manifestURL: manifestURL};
-  webappActorRequest(request, function (aResponse) {
-    do_check_true("app" in aResponse);
-    let app = aResponse.app;
-    do_check_eq(app.id, gAppId);
-    do_check_eq(app.name, "Test app");
-    do_check_eq(app.manifest.description, "Testing webapps actor");
-    do_check_eq(app.manifest.launch_path, "/index.html");
-    do_check_eq(app.origin, APP_ORIGIN);
-    do_check_eq(app.installOrigin, app.origin);
-    do_check_eq(app.manifestURL, app.origin + "/manifest.webapp");
-    run_next_test();
-  });
-});
-
-add_test(function testLaunchApp() {
-  let manifestURL = APP_ORIGIN + "/manifest.webapp";
-  let startPoint = "/index.html";
-  let request = {
-    type: "launch",
-    manifestURL: manifestURL,
-    startPoint: startPoint
-  };
-  Services.obs.addObserver(function observer(subject, topic, data) {
-    Services.obs.removeObserver(observer, topic);
-    let json = JSON.parse(data);
-    do_check_eq(json.manifestURL, manifestURL);
-    do_check_eq(json.startPoint, startPoint);
-    run_next_test();
-  }, "webapps-launch", false);
-
-  webappActorRequest(request, function (aResponse) {
-    do_check_false("error" in aResponse);
-  });
-});
-
-add_test(function testCloseApp() {
-  let manifestURL = APP_ORIGIN + "/manifest.webapp";
-  let request = {
-    type: "close",
-    manifestURL: manifestURL
-  };
-  Services.obs.addObserver(function observer(subject, topic, data) {
-    Services.obs.removeObserver(observer, topic);
-    let json = JSON.parse(data);
-    do_check_eq(json.manifestURL, manifestURL);
-
-  }, "webapps-close", false);
-
-  webappActorRequest(request, function (aResponse) {
-    do_check_false("error" in aResponse);
-    run_next_test();
-  });
-});
-
-// The 128px icon is a single red pixel and the 64px one is a blue one
-// bug 899177: there is a bug with xhr and app:// and jar:// uris
-// that ends up forcing the content type to application/xml
-var red1px = "data:application/xml;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12P4z8AAAAMBAQAY3Y2wAAAAAElFTkSuQmCC";
-var blue1px = "data:application/xml;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12MwZDgHAAFlAQBDpjhLAAAAAElFTkSuQmCC";
-
-add_test(function testGetIcon() {
-  let manifestURL = APP_ORIGIN + "/manifest.webapp";
-  let request = {
-    type: "getIconAsDataURL",
-    manifestURL: manifestURL
-  };
-
-  webappActorRequest(request, function (aResponse) {
-    do_check_false("error" in aResponse);
-
-    // By default, getIconAsDataURL return the 128x128 icon
-    do_check_eq(aResponse.url, red1px);
-    run_next_test();
-  });
-});
-
-add_test(function testGetIconWithCustomSize() {
-  let manifestURL = APP_ORIGIN + "/manifest.webapp";
-  let request = {
-    type: "getIconAsDataURL",
-    manifestURL: manifestURL,
-    size: 64
-  };
-
-  webappActorRequest(request, function (aResponse) {
-    do_check_false("error" in aResponse);
-
-    do_check_eq(aResponse.url, blue1px);
-    run_next_test();
-  });
-});
-
-add_test(function testUninstall() {
-  let manifestURL = APP_ORIGIN + "/manifest.webapp";
-  let request = {
-    type: "uninstall",
-    manifestURL: manifestURL
-  };
-
-  Services.obs.addObserver(function observer(subject, topic, data) {
-    Services.obs.removeObserver(observer, topic);
-    let json = JSON.parse(data);
-    do_check_eq(json.manifestURL, manifestURL);
-    do_check_eq(json.origin, APP_ORIGIN);
-    do_check_eq(json.id, gAppId);
-    run_next_test();
-  }, "webapps-uninstall", false);
-
-  webappActorRequest(request, function (aResponse) {
-    do_check_false("error" in aResponse);
-  });
-});
-
-add_test(function testFileUploadInstall() {
-  let packageFile = do_get_file("data/app.zip");
-
-  // Disable the bulk trait temporarily to test the JSON upload path
-  gClient.traits.bulk = false;
-
-  let progressDeferred = defer();
-  // Ensure we get at least one progress event at the end
-  gActorFront.on("install-progress", function onProgress(e, progress) {
-    if (progress.bytesSent == progress.totalBytes) {
-      gActorFront.off("install-progress", onProgress);
-      progressDeferred.resolve();
-    }
-  });
-
-  let installed =
-    gActorFront.installPackaged(packageFile.path, gAppId)
-    .then(function ({ appId }) {
-      do_check_eq(appId, gAppId);
-    }, function (e) {
-      do_throw("Failed install uploaded packaged app: " + e.error + ": " + e.message);
-    });
-
-  promise.all([progressDeferred.promise, installed])
-    .then(() => {
-      // Restore default bulk trait value
-      gClient.traits.bulk = true;
-      run_next_test();
-    });
-});
-
-add_test(function testBulkUploadInstall() {
-  let packageFile = do_get_file("data/app.zip");
-  do_check_true(gClient.traits.bulk);
-
-  let progressDeferred = defer();
-  // Ensure we get at least one progress event at the end
-  gActorFront.on("install-progress", function onProgress(e, progress) {
-    if (progress.bytesSent == progress.totalBytes) {
-      gActorFront.off("install-progress", onProgress);
-      progressDeferred.resolve();
-    }
-  });
-
-  let installed =
-    gActorFront.installPackaged(packageFile.path, gAppId)
-    .then(function ({ appId }) {
-      do_check_eq(appId, gAppId);
-    }, function (e) {
-      do_throw("Failed bulk install uploaded packaged app: " + e.error + ": " + e.message);
-    });
-
-  promise.all([progressDeferred.promise, installed])
-    .then(run_next_test);
-});
-
-add_test(function testInstallHosted() {
-  gAppId = "hosted-app";
-  let metadata = {
-    origin: "http://foo.com",
-    installOrigin: "http://metadata.foo.com",
-    manifestURL: "http://foo.com/metadata/manifest.webapp"
-  };
-  let manifest = {
-    name: "My hosted app",
-    csp: "script-src: http://foo.com"
-  };
-  gActorFront.installHosted(gAppId, metadata, manifest)
-  .then(function ({ appId }) {
-    do_check_eq(appId, gAppId);
-    run_next_test();
-  },
-  function (e) {
-    do_throw("Failed installing hosted app: " + e.error + ": " + e.message);
-  });
-});
-
-add_test(function testCheckHostedApp() {
-  let request = {type: "getAll"};
-  webappActorRequest(request, function (aResponse) {
-    do_check_true("apps" in aResponse);
-    let apps = aResponse.apps;
-    do_check_true(apps.length > 0);
-    for (let i = 0; i < apps.length; i++) {
-      let app = apps[i];
-      if (app.id == gAppId) {
-        do_check_eq(app.name, "My hosted app");
-        do_check_eq(app.origin, "http://foo.com");
-        do_check_eq(app.installOrigin, "http://metadata.foo.com");
-        do_check_eq(app.manifestURL, "http://foo.com/metadata/manifest.webapp");
-        do_check_eq(app.csp, "script-src: http://foo.com");
-        run_next_test();
-        return;
-      }
-    }
-    do_throw("Unable to find the test app by its id");
-  });
-});
-
-add_test(function testInstallOverrideSystem() {
-  let appId = "actor-test"; // Match app.zip id
-
-  // Make the test app non-removable, like system apps
-  DOMApplicationRegistry.webapps[appId].removable = false;
-
-  let packageFile = do_get_file("data/app.zip");
-  gActorFront.installPackaged(packageFile.path, appId)
-    .then(function ({ appId }) {
-      do_throw("Override of a non-removable app has been accepted.");
-    }, function (e) {
-      do_check_eq(e.message, "The application " + appId + " can't be overridden.");
-
-      // Then make it removable again...
-      DOMApplicationRegistry.webapps[appId].removable = true;
-      run_next_test();
-    });
-});
-
-add_test(function testInstallEngineeringMode() {
-  let appId = "actor-test"; // Match app.zip id
-
-  let packageFile = do_get_file("data/app-engineering.zip");
-  gActorFront.installPackaged(packageFile.path, appId)
-    .then(function ({ appId }) {
-      do_throw("App with engineering mode permission was accepted.");
-    }, function (e) {
-      do_check_eq(e.message, "Installing apps with any of these permissions is forbidden: " +
-                             Services.prefs.getCharPref("devtools.apps.forbidden-permissions"));
-      run_next_test();
-    });
-});
-
-function run_test() {
-  setup();
-
-  run_next_test();
-}
deleted file mode 100644
--- a/devtools/shared/apps/tests/unit/xpcshell.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[DEFAULT]
-tags = devtools
-head = head_apps.js
-tail = tail_apps.js
-firefox-appdir = browser
-skip-if = toolkit == 'android' || (toolkit == 'gonk' && debug) # Bug 1206586
-support-files =
-  data/app.zip
-  data/app-engineering.zip
-
-[test_webappsActor.js]
-skip-if = buildapp == "b2g"
--- a/dom/indexedDB/test/unit/test_defaultStorageUpgrade.js
+++ b/dom/indexedDB/test/unit/test_defaultStorageUpgrade.js
@@ -41,20 +41,16 @@ function testSteps()
     { url: "file:///c:/Users/joe/", dbName: "dbJ", dbVersion: 1 },
 
     // This one lives in storage/default/file++++c++Users+joe+index.html
     { url: "file:///c:/Users/joe/index.html", dbName: "dbK", dbVersion: 1 },
 
     // This one lives in storage/permanent/chrome
     { dbName: "dbL", dbVersion: 1 },
 
-    // This one lives in storage/default/1007+f+app+++system.gaiamobile.org
-    { appId: 1007, inIsolatedMozBrowser: false, url: "app://system.gaiamobile.org",
-      dbName: "dbM", dbVersion: 1 },
-
     // This one lives in storage/default/1007+t+https+++developer.cdn.mozilla.net
     { appId: 1007, inIsolatedMozBrowser: true, url: "https://developer.cdn.mozilla.net",
       dbName: "dbN", dbVersion: 1 },
 
     // This one lives in storage/default/http+++127.0.0.1
     { url: "http://127.0.0.1", dbName: "dbO", dbVersion: 1 },
 
     // This one lives in storage/default/file++++
@@ -86,20 +82,16 @@ function testSteps()
       dbOptions: { version: 1, storage: "temporary" } },
 
     // This one lives in storage/temporary/http+++localhost+82
     // The .metadata file was intentionally truncated for this origin directory
     // to test restoring during upgrade.
     { url: "http://localhost:82", dbName: "dbW",
       dbOptions: { version: 1, storage: "temporary" } },
 
-    // This one lives in storage/temporary/1007+f+app+++system.gaiamobile.org
-    { appId: 1007, inIsolatedMozBrowser: false, url: "app://system.gaiamobile.org",
-      dbName: "dbX", dbOptions: { version: 1, storage: "temporary" } },
-
     // This one lives in storage/temporary/1007+t+https+++developer.cdn.mozilla.net
     { appId: 1007, inIsolatedMozBrowser: true, url: "https://developer.cdn.mozilla.net",
       dbName: "dbY", dbOptions: { version: 1, storage: "temporary" } },
 
     // This one lives in storage/temporary/http+++localhost
     { url: "http://localhost", dbName: "dbZ",
       dbOptions: { version: 1, storage: "temporary" } }
   ];
--- a/dom/indexedDB/test/unit/test_idbSubdirUpgrade.js
+++ b/dom/indexedDB/test/unit/test_idbSubdirUpgrade.js
@@ -6,20 +6,16 @@
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const openParams = [
     // This one lives in storage/default/http+++www.mozilla.org
     { url: "http://www.mozilla.org", dbName: "dbB", dbVersion: 1 },
 
-    // This one lives in storage/default/1007+f+app+++system.gaiamobile.org
-    { appId: 1007, inIsolatedMozBrowser: false, url: "app://system.gaiamobile.org",
-      dbName: "dbM", dbVersion: 1 },
-
     // This one lives in storage/default/1007+t+https+++developer.cdn.mozilla.net
     { appId: 1007, inIsolatedMozBrowser: true, url: "https://developer.cdn.mozilla.net",
       dbName: "dbN", dbVersion: 1 },
   ];
 
   let ios = SpecialPowers.Cc["@mozilla.org/network/io-service;1"]
                          .getService(SpecialPowers.Ci.nsIIOService);
 
--- a/dom/indexedDB/test/unit/test_schema23upgrade.js
+++ b/dom/indexedDB/test/unit/test_schema23upgrade.js
@@ -6,20 +6,16 @@
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const openParams = [
     // This one lives in storage/default/http+++www.mozilla.org
     { url: "http://www.mozilla.org", dbName: "dbB", dbVersion: 1 },
 
-    // This one lives in storage/default/1007+f+app+++system.gaiamobile.org
-    { appId: 1007, inIsolatedMozBrowser: false, url: "app://system.gaiamobile.org",
-      dbName: "dbM", dbVersion: 1 },
-
     // This one lives in storage/default/1007+t+https+++developer.cdn.mozilla.net
     { appId: 1007, inIsolatedMozBrowser: true, url: "https://developer.cdn.mozilla.net",
       dbName: "dbN", dbVersion: 1 },
   ];
 
   let ios = SpecialPowers.Cc["@mozilla.org/network/io-service;1"]
                          .getService(SpecialPowers.Ci.nsIIOService);
 
--- a/dom/indexedDB/test/unit/test_storagePersistentUpgrade.js
+++ b/dom/indexedDB/test/unit/test_storagePersistentUpgrade.js
@@ -6,20 +6,16 @@
 var testGenerator = testSteps();
 
 function testSteps()
 {
   const openParams = [
     // This one lives in storage/default/http+++www.mozilla.org
     { url: "http://www.mozilla.org", dbName: "dbB", dbVersion: 1 },
 
-    // This one lives in storage/default/1007+f+app+++system.gaiamobile.org
-    { appId: 1007, inIsolatedMozBrowser: false, url: "app://system.gaiamobile.org",
-      dbName: "dbM", dbVersion: 1 },
-
     // This one lives in storage/default/1007+t+https+++developer.cdn.mozilla.net
     { appId: 1007, inIsolatedMozBrowser: true, url: "https://developer.cdn.mozilla.net",
       dbName: "dbN", dbVersion: 1 },
   ];
 
   let ios = SpecialPowers.Cc["@mozilla.org/network/io-service;1"]
                          .getService(SpecialPowers.Ci.nsIIOService);
 
--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@@ -17,17 +17,16 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/netwerk/base',
     '/netwerk/cache',
     '/netwerk/dns',
     '/netwerk/mime',
     '/netwerk/protocol/about',
-    '/netwerk/protocol/app',
     '/netwerk/socket',
     '/netwerk/streamconv',
     '/netwerk/streamconv/converters',
 ]
 
 protocols = CONFIG['NECKO_PROTOCOLS']
 LOCAL_INCLUDES += sorted([
     '/netwerk/protocol/%s' % d for d in protocols if d != 'about'
--- a/netwerk/build/nsNetCID.h
+++ b/netwerk/build/nsNetCID.h
@@ -672,28 +672,16 @@
 { /* fbc81170-1f69-11d3-9344-00104ba0fd40 */         \
     0xfbc81170,                                      \
     0x1f69,                                          \
     0x11d3,                                          \
     {0x93, 0x44, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
 }
 
 /******************************************************************************
- * netwerk/protocol/app/ classes
- */
-
-#define NS_APPPROTOCOLHANDLER_CID                    \
-{ /* {B6ED3030-9999-11d3-A178-0050041CAF44} */       \
-    0xb6ed3030,                                      \
-    0x9999,                                          \
-    0x11d3,                                          \
-    {0xa1, 0x78, 0x00, 0x50, 0x04, 0x1c, 0xaf, 0x44} \
-}
-
-/******************************************************************************
  * netwerk/protocol/data/ classes
  */
 
 #define NS_DATAPROTOCOLHANDLER_CID                   \
 { /* {B6ED3030-6183-11d3-A178-0050041CAF44} */       \
     0xb6ed3030,                                      \
     0x6183,                                          \
     0x11d3,                                          \
--- a/netwerk/build/nsNetModule.cpp
+++ b/netwerk/build/nsNetModule.cpp
@@ -290,17 +290,16 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsHttpDig
 #include "mozilla/net/PackagedAppVerifier.h"
 namespace mozilla {
 namespace net {
   NS_GENERIC_FACTORY_CONSTRUCTOR(Dashboard)
   NS_GENERIC_FACTORY_CONSTRUCTOR(PackagedAppService)
   NS_GENERIC_FACTORY_CONSTRUCTOR(PackagedAppVerifier)
 } // namespace net
 } // namespace mozilla
-#include "AppProtocolHandler.h"
 
 #ifdef NECKO_PROTOCOL_res
 // resource
 #include "nsResProtocolHandler.h"
 #include "ExtensionProtocolHandler.h"
 #include "SubstitutingProtocolHandler.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsResProtocolHandler, Init)
 
@@ -820,17 +819,16 @@ NS_DEFINE_NAMED_CID(NS_ABOUT_CACHE_ENTRY
 #endif
 NS_DEFINE_NAMED_CID(NS_SOCKSSOCKETPROVIDER_CID);
 NS_DEFINE_NAMED_CID(NS_SOCKS4SOCKETPROVIDER_CID);
 NS_DEFINE_NAMED_CID(NS_UDPSOCKETPROVIDER_CID);
 NS_DEFINE_NAMED_CID(NS_CACHESERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_APPLICATIONCACHESERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_APPLICATIONCACHENAMESPACE_CID);
 NS_DEFINE_NAMED_CID(NS_APPLICATIONCACHE_CID);
-NS_DEFINE_NAMED_CID(NS_APPPROTOCOLHANDLER_CID);
 #ifdef NECKO_COOKIES
 NS_DEFINE_NAMED_CID(NS_COOKIEMANAGER_CID);
 NS_DEFINE_NAMED_CID(NS_COOKIESERVICE_CID);
 #endif
 #ifdef NECKO_WIFI
 NS_DEFINE_NAMED_CID(NS_WIFI_MONITOR_COMPONENT_CID);
 #endif
 #ifdef NECKO_PROTOCOL_data
@@ -973,17 +971,16 @@ static const mozilla::Module::CIDEntry k
 #endif
     { &kNS_SOCKSSOCKETPROVIDER_CID, false, nullptr, nsSOCKSSocketProvider::CreateV5 },
     { &kNS_SOCKS4SOCKETPROVIDER_CID, false, nullptr, nsSOCKSSocketProvider::CreateV4 },
     { &kNS_UDPSOCKETPROVIDER_CID, false, nullptr, nsUDPSocketProviderConstructor },
     { &kNS_CACHESERVICE_CID, false, nullptr, nsCacheService::Create },
     { &kNS_APPLICATIONCACHESERVICE_CID, false, nullptr, nsApplicationCacheServiceConstructor },
     { &kNS_APPLICATIONCACHENAMESPACE_CID, false, nullptr, nsApplicationCacheNamespaceConstructor },
     { &kNS_APPLICATIONCACHE_CID, false, nullptr, nsApplicationCacheConstructor },
-    { &kNS_APPPROTOCOLHANDLER_CID, false, nullptr, AppProtocolHandler::Create },
 #ifdef NECKO_COOKIES
     { &kNS_COOKIEMANAGER_CID, false, nullptr, nsICookieServiceConstructor },
     { &kNS_COOKIESERVICE_CID, false, nullptr, nsICookieServiceConstructor },
 #endif
 #ifdef NECKO_WIFI
     { &kNS_WIFI_MONITOR_COMPONENT_CID, false, nullptr, nsWifiMonitorConstructor },
 #endif
 #ifdef NECKO_PROTOCOL_data
@@ -1135,17 +1132,16 @@ static const mozilla::Module::ContractID
 #endif
     { NS_NETWORK_SOCKET_CONTRACTID_PREFIX "socks", &kNS_SOCKSSOCKETPROVIDER_CID },
     { NS_NETWORK_SOCKET_CONTRACTID_PREFIX "socks4", &kNS_SOCKS4SOCKETPROVIDER_CID },
     { NS_NETWORK_SOCKET_CONTRACTID_PREFIX "udp", &kNS_UDPSOCKETPROVIDER_CID },
     { NS_CACHESERVICE_CONTRACTID, &kNS_CACHESERVICE_CID },
     { NS_APPLICATIONCACHESERVICE_CONTRACTID, &kNS_APPLICATIONCACHESERVICE_CID },
     { NS_APPLICATIONCACHENAMESPACE_CONTRACTID, &kNS_APPLICATIONCACHENAMESPACE_CID },
     { NS_APPLICATIONCACHE_CONTRACTID, &kNS_APPLICATIONCACHE_CID },
-    { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "app", &kNS_APPPROTOCOLHANDLER_CID },
 #ifdef NECKO_COOKIES
     { NS_COOKIEMANAGER_CONTRACTID, &kNS_COOKIEMANAGER_CID },
     { NS_COOKIESERVICE_CONTRACTID, &kNS_COOKIESERVICE_CID },
 #endif
 #ifdef NECKO_WIFI
     { NS_WIFI_MONITOR_CONTRACTID, &kNS_WIFI_MONITOR_COMPONENT_CID },
 #endif
 #ifdef NECKO_PROTOCOL_data
--- a/netwerk/ipc/NeckoParent.cpp
+++ b/netwerk/ipc/NeckoParent.cpp
@@ -69,31 +69,16 @@ PNeckoParent *gNeckoParent = nullptr;
 NeckoParent::NeckoParent()
 {
   // Init HTTP protocol handler now since we need atomTable up and running very
   // early (IPDL argument handling for PHttpChannel constructor needs it) so
   // normal init (during 1st Http channel request) isn't early enough.
   nsCOMPtr<nsIProtocolHandler> proto =
     do_GetService("@mozilla.org/network/protocol;1?name=http");
 
-  if (UsingNeckoIPCSecurity()) {
-    // cache values for core/packaged apps basepaths
-    nsAutoString corePath, webPath;
-    nsCOMPtr<nsIAppsService> appsService = do_GetService(APPS_SERVICE_CONTRACTID);
-    if (appsService) {
-      appsService->GetCoreAppsBasePath(corePath);
-      appsService->GetWebAppsBasePath(webPath);
-    }
-    // corePath may be empty: we don't use it for all build types
-    MOZ_ASSERT(!webPath.IsEmpty());
-
-    LossyCopyUTF16toASCII(corePath, mCoreAppsBasePath);
-    LossyCopyUTF16toASCII(webPath, mWebAppsBasePath);
-  }
-
   mObserver = new OfflineObserver(this);
   gNeckoParent = this;
 }
 
 NeckoParent::~NeckoParent()
 {
   gNeckoParent = nullptr;
   if (mObserver) {
@@ -612,108 +597,16 @@ NeckoParent::AllocPRemoteOpenFileParent(
       bool fromExtension = false;
       if (NS_SUCCEEDED(appsService->IsExtensionResource(appUri, &fromExtension)) &&
           fromExtension) {
         RemoteOpenFileParent* parent = new RemoteOpenFileParent(fileURL);
         return parent;
       }
       return nullptr;
     }
-
-    nsAutoCString requestedPath;
-    fileURL->GetPath(requestedPath);
-    NS_UnescapeURL(requestedPath);
-
-    // Check if we load the whitelisted app uri for the neterror page.
-    bool netErrorWhiteList = false;
-
-    if (appUri) {
-      nsAdoptingString netErrorURI;
-      netErrorURI = Preferences::GetString("b2g.neterror.url");
-      if (netErrorURI) {
-        nsAutoCString spec;
-        appUri->GetSpec(spec);
-        netErrorWhiteList = spec.Equals(NS_ConvertUTF16toUTF8(netErrorURI).get());
-      }
-    }
-
-    // Check if we load a resource from the shared theme url space.
-    // If we try to load the theme but have no permission, refuse to load.
-    bool themeWhitelist = false;
-    if (Preferences::GetBool("dom.mozApps.themable") && appUri) {
-      nsAutoCString origin;
-      nsPrincipal::GetOriginForURI(appUri, origin);
-      nsAutoCString themeOrigin;
-      themeOrigin = Preferences::GetCString("b2g.theme.origin");
-      themeWhitelist = origin.Equals(themeOrigin);
-      if (themeWhitelist) {
-        bool hasThemePerm = false;
-        mozApp->HasPermission("themeable", &hasThemePerm);
-        if (!hasThemePerm) {
-          return nullptr;
-        }
-      }
-    }
-
-    if (hasManage || netErrorWhiteList || themeWhitelist) {
-      // webapps-manage permission means allow reading any application.zip file
-      // in either the regular webapps directory, or the core apps directory (if
-      // we're using one).
-      NS_NAMED_LITERAL_CSTRING(appzip, "/application.zip");
-      nsAutoCString pathEnd;
-      requestedPath.Right(pathEnd, appzip.Length());
-      if (!pathEnd.Equals(appzip)) {
-        return nullptr;
-      }
-      nsAutoCString pathStart;
-      requestedPath.Left(pathStart, mWebAppsBasePath.Length());
-      if (!pathStart.Equals(mWebAppsBasePath)) {
-        if (mCoreAppsBasePath.IsEmpty()) {
-          return nullptr;
-        }
-        requestedPath.Left(pathStart, mCoreAppsBasePath.Length());
-        if (!pathStart.Equals(mCoreAppsBasePath)) {
-          return nullptr;
-        }
-      }
-      // Finally: make sure there are no "../" in URI.
-      // Note: not checking for symlinks (would cause I/O for each path
-      // component).  So it's up to us to avoid creating symlinks that could
-      // provide attack vectors.
-      if (PL_strnstr(requestedPath.BeginReading(), "/../",
-                     requestedPath.Length())) {
-        printf_stderr("NeckoParent::AllocPRemoteOpenFile: "
-                      "FATAL error: requested file URI '%s' contains '/../' "
-                      "KILLING CHILD PROCESS\n", requestedPath.get());
-        return nullptr;
-      }
-    } else {
-      // regular packaged apps can only access their own application.zip file
-      nsAutoString basePath;
-      nsresult rv = mozApp->GetBasePath(basePath);
-      if (NS_FAILED(rv)) {
-        return nullptr;
-      }
-      nsAutoString uuid;
-      rv = mozApp->GetId(uuid);
-      if (NS_FAILED(rv)) {
-        return nullptr;
-      }
-      nsPrintfCString mustMatch("%s/%s/application.zip",
-                                NS_LossyConvertUTF16toASCII(basePath).get(),
-                                NS_LossyConvertUTF16toASCII(uuid).get());
-      if (!requestedPath.Equals(mustMatch)) {
-        printf_stderr("NeckoParent::AllocPRemoteOpenFile: "
-                      "FATAL error: app without webapps-manage permission is "
-                      "requesting file '%s' but is only allowed to open its "
-                      "own application.zip at %s: KILLING CHILD PROCESS\n",
-                      requestedPath.get(), mustMatch.get());
-        return nullptr;
-      }
-    }
   }
 
   RemoteOpenFileParent* parent = new RemoteOpenFileParent(fileURL);
   return parent;
 }
 
 bool
 NeckoParent::RecvPRemoteOpenFileConstructor(
--- a/netwerk/ipc/NeckoParent.h
+++ b/netwerk/ipc/NeckoParent.h
@@ -230,18 +230,16 @@ protected:
                              const ipc::OptionalURIParams& aSourceURI,
                              const PredictorPredictReason& aReason,
                              const IPC::SerializedLoadContext& aLoadContext) override;
   virtual bool RecvPredReset() override;
 
   virtual bool RecvRemoveRequestContext(const nsCString& rcid) override;
 
 private:
-  nsCString mCoreAppsBasePath;
-  nsCString mWebAppsBasePath;
   RefPtr<OfflineObserver> mObserver;
 };
 
 /**
  * Reference to the PNecko Parent protocol.
  */
 extern PNeckoParent *gNeckoParent;
 
deleted file mode 100644
--- a/netwerk/protocol/app/AppProtocolHandler.cpp
+++ /dev/null
@@ -1,513 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set expandtab ts=2 sw=2 sts=2 cin: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "AppProtocolHandler.h"
-#include "nsBaseChannel.h"
-#include "nsJARChannel.h"
-#include "nsNetCID.h"
-#include "nsNetUtil.h"
-#include "nsIStandardURL.h"
-#include "nsIAppsService.h"
-#include "nsILoadInfo.h"
-#include "nsXULAppAPI.h"
-#include "nsPrincipal.h"
-#include "nsContentSecurityManager.h"
-#include "nsContentUtils.h"
-
-#include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/Preferences.h"
-
-using namespace mozilla;
-
-/**
-  * This dummy channel implementation only provides enough functionality
-  * to return a fake 404 error when the caller asks for an app:// URL
-  * containing an unknown appId.
-  */
-class DummyChannel : public nsIJARChannel
-                          , Runnable
-{
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIREQUEST
-  NS_DECL_NSICHANNEL
-  NS_DECL_NSIJARCHANNEL
-
-  DummyChannel();
-
-  NS_IMETHODIMP Run() override;
-
-private:
-  ~DummyChannel() {}
-
-  bool                        mPending;
-  uint32_t                    mSuspendCount;
-  nsCOMPtr<nsISupports>       mListenerContext;
-  nsCOMPtr<nsIStreamListener> mListener;
-  nsCOMPtr<nsILoadGroup>      mLoadGroup;
-  nsLoadFlags                 mLoadFlags;
-  nsCOMPtr<nsILoadInfo>       mLoadInfo;
-};
-
-NS_IMPL_ISUPPORTS_INHERITED(DummyChannel, Runnable, nsIRequest, nsIChannel, nsIJARChannel)
-
-DummyChannel::DummyChannel() : mPending(false)
-                             , mSuspendCount(0)
-                             , mLoadFlags(LOAD_NORMAL)
-{
-}
-
-NS_IMETHODIMP DummyChannel::GetName(nsACString &result)
-{
-  result = "dummy_app_channel";
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::GetStatus(nsresult *aStatus)
-{
-  *aStatus = NS_ERROR_FILE_NOT_FOUND;
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::IsPending(bool *aResult)
-{
-  *aResult = mPending;
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::Suspend()
-{
-  mSuspendCount++;
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::Resume()
-{
-  if (mSuspendCount <= 0) {
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  if (--mSuspendCount == 0) {
-    NS_DispatchToMainThread(this, NS_DISPATCH_NORMAL);
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::Open(nsIInputStream**)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-DummyChannel::Open2(nsIInputStream** aStream)
-{
-  nsCOMPtr<nsIStreamListener> listener;
-  nsresult rv = nsContentSecurityManager::doContentSecurityCheck(this, listener);
-  NS_ENSURE_SUCCESS(rv, rv);
-  return Open(aStream);
-}
-
-NS_IMETHODIMP DummyChannel::AsyncOpen(nsIStreamListener* aListener, nsISupports* aContext)
-{
-  MOZ_ASSERT(!mLoadInfo ||
-             mLoadInfo->GetSecurityMode() == 0 ||
-             mLoadInfo->GetInitialSecurityCheckDone() ||
-             (mLoadInfo->GetSecurityMode() == nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL &&
-              nsContentUtils::IsSystemPrincipal(mLoadInfo->LoadingPrincipal())),
-             "security flags in loadInfo but asyncOpen2() not called");
-
-  mListener = aListener;
-  mListenerContext = aContext;
-  mPending = true;
-
-  if (mLoadGroup) {
-    mLoadGroup->AddRequest(this, aContext);
-  }
-
-  if (mSuspendCount == 0) {
-    NS_DispatchToMainThread(this, NS_DISPATCH_NORMAL);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DummyChannel::AsyncOpen2(nsIStreamListener* aListener)
-{
-  nsCOMPtr<nsIStreamListener> listener = aListener;
-  nsresult rv = nsContentSecurityManager::doContentSecurityCheck(this, listener);
-  NS_ENSURE_SUCCESS(rv, rv);
-  return AsyncOpen(listener, nullptr);
-}
-
-// nsIJarChannel, needed for XHR to turn NS_ERROR_FILE_NOT_FOUND into
-// a 404 error.
-NS_IMETHODIMP DummyChannel::GetIsUnsafe(bool *aResult)
-{
-  *aResult = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::SetAppURI(nsIURI *aURI)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetJarFile(nsIFile* *aFile)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetZipEntry(nsIZipEntry* *aEntry)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::Run()
-{
-  nsresult rv = mListener->OnStartRequest(this, mListenerContext);
-  mPending = false;
-  rv = mListener->OnStopRequest(this, mListenerContext, NS_ERROR_FILE_NOT_FOUND);
-  if (mLoadGroup) {
-    mLoadGroup->RemoveRequest(this, mListenerContext, NS_ERROR_FILE_NOT_FOUND);
-  }
-
-  mListener = nullptr;
-  mListenerContext = nullptr;
-  rv = SetNotificationCallbacks(nullptr);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::Cancel(nsresult)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-  *aLoadGroup = mLoadGroup;
-  NS_IF_ADDREF(*aLoadGroup);
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-  mLoadGroup = aLoadGroup;
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::GetLoadFlags(nsLoadFlags *aLoadFlags)
-{
-  *aLoadFlags = mLoadFlags;
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::SetLoadFlags(nsLoadFlags aLoadFlags)
-{
-  mLoadFlags = aLoadFlags;
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::GetOriginalURI(nsIURI**)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::SetOriginalURI(nsIURI*)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetOwner(nsISupports**)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::SetOwner(nsISupports*)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetLoadInfo(nsILoadInfo** aLoadInfo)
-{
-  NS_IF_ADDREF(*aLoadInfo = mLoadInfo);
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::SetLoadInfo(nsILoadInfo* aLoadInfo)
-{
-  mLoadInfo = aLoadInfo;
-  return NS_OK;
-}
-
-NS_IMETHODIMP DummyChannel::GetNotificationCallbacks(nsIInterfaceRequestor**)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::SetNotificationCallbacks(nsIInterfaceRequestor*)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetSecurityInfo(nsISupports**)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetContentType(nsACString&)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::SetContentType(const nsACString&)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetContentCharset(nsACString&)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::SetContentCharset(const nsACString&)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetContentLength(int64_t*)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::SetContentLength(int64_t)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetContentDisposition(uint32_t*)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::SetContentDisposition(uint32_t)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetURI(nsIURI**)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetContentDispositionFilename(nsAString&)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::SetContentDispositionFilename(nsAString const &)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP DummyChannel::GetContentDispositionHeader(nsACString&)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/**
-  * app:// protocol implementation.
-  */
-
-AppProtocolHandler::AppProtocolHandler() {
-}
-
-AppProtocolHandler::~AppProtocolHandler() {
-  mAppInfoCache.Clear();
-}
-
-NS_IMPL_ISUPPORTS(AppProtocolHandler, nsIProtocolHandler)
-
-/* static */
-nsresult
-AppProtocolHandler::Create(nsISupports* aOuter,
-                           const nsIID& aIID,
-                           void* *aResult)
-{
-  // Instantiate the service here since that intializes gJarHandler, which we
-  // use indirectly (via our new JarChannel) in NewChannel.
-  nsCOMPtr<nsIProtocolHandler> jarInitializer(
-    do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "jar"));
-  AppProtocolHandler* ph = new AppProtocolHandler();
-  if (ph == nullptr) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  NS_ADDREF(ph);
-  nsresult rv = ph->QueryInterface(aIID, aResult);
-  NS_RELEASE(ph);
-  return rv;
-}
-
-NS_IMETHODIMP
-AppProtocolHandler::GetScheme(nsACString &aResult)
-{
-  aResult.AssignLiteral("app");
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-AppProtocolHandler::GetDefaultPort(int32_t *aResult)
-{
-  // No ports for the app protocol.
-  *aResult = -1;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-AppProtocolHandler::GetProtocolFlags(uint32_t *aResult)
-{
-  *aResult = URI_NOAUTH |
-             URI_DANGEROUS_TO_LOAD |
-             URI_CROSS_ORIGIN_NEEDS_WEBAPPS_PERM;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-AppProtocolHandler::NewURI(const nsACString &aSpec,
-                           const char *aCharset, // ignore charset info
-                           nsIURI *aBaseURI,
-                           nsIURI **result)
-{
-  nsresult rv;
-  nsCOMPtr<nsIStandardURL> surl(do_CreateInstance(NS_STANDARDURL_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = surl->Init(nsIStandardURL::URLTYPE_STANDARD, -1, aSpec, aCharset, aBaseURI);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<nsIURL> url(do_QueryInterface(surl, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  url.forget(result);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-AppProtocolHandler::NewChannel2(nsIURI* aUri,
-                                nsILoadInfo* aLoadInfo,
-                                nsIChannel** aResult)
-{
-  NS_ENSURE_ARG_POINTER(aUri);
-  RefPtr<nsJARChannel> channel = new nsJARChannel();
-
-  nsAutoCString host;
-  nsresult rv = aUri->GetHost(host);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (Preferences::GetBool("dom.mozApps.themable")) {
-    nsAutoCString origin;
-    nsPrincipal::GetOriginForURI(aUri, origin);
-    nsAdoptingCString themeOrigin;
-    themeOrigin = Preferences::GetCString("b2g.theme.origin");
-    if (themeOrigin.Equals(origin)) {
-      // We are trying to load a theme resource. Check whether we have a
-      // package registered as a theme provider to override the file path.
-      nsAdoptingCString selectedTheme;
-      selectedTheme = Preferences::GetCString("dom.mozApps.selected_theme");
-      if (!selectedTheme.IsEmpty()) {
-        // Substitute the path with the actual theme.
-        host = selectedTheme;
-      }
-    }
-  }
-
-  nsAutoCString fileSpec;
-  nsCOMPtr<nsIURL> url = do_QueryInterface(aUri);
-  rv = url->GetFilePath(fileSpec);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mozilla::dom::AppInfo *appInfo;
-
-  if (!mAppInfoCache.Get(host, &appInfo)) {
-    nsCOMPtr<nsIAppsService> appsService = do_GetService(APPS_SERVICE_CONTRACTID);
-    if (!appsService) {
-      return NS_ERROR_FAILURE;
-    }
-
-    mozilla::AutoSafeJSContext cx;
-    JS::RootedValue jsInfo(cx);
-    rv = appsService->GetAppInfo(NS_ConvertUTF8toUTF16(host), &jsInfo);
-    if (NS_FAILED(rv) || !jsInfo.isObject()) {
-      // Return a DummyChannel.
-      printf_stderr("!! Creating a dummy channel for %s (no appInfo)\n", host.get());
-      RefPtr<nsIChannel> dummyChannel = new DummyChannel();
-      dummyChannel->SetLoadInfo(aLoadInfo);
-      dummyChannel.forget(aResult);
-      return NS_OK;
-    }
-
-    appInfo = new mozilla::dom::AppInfo();
-    JSAutoCompartment ac(cx, &jsInfo.toObject());
-    if (!appInfo->Init(cx, jsInfo) || appInfo->mPath.IsEmpty()) {
-      // Return a DummyChannel.
-      printf_stderr("!! Creating a dummy channel for %s (invalid appInfo)\n", host.get());
-      RefPtr<nsIChannel> dummyChannel = new DummyChannel();
-      dummyChannel->SetLoadInfo(aLoadInfo);
-      dummyChannel.forget(aResult);
-      return NS_OK;
-    }
-    mAppInfoCache.Put(host, appInfo);
-  }
-
-  // Even core apps are on /system partition and can be accessed directly, but
-  // to ease sandboxing code not to handle the special case of core apps, only
-  // use scheme jar:file in parent, see bug 1119692 comment 20.
-  nsAutoCString jarSpec(XRE_IsParentProcess() ? "jar:file://"
-                                              : "jar:remoteopenfile://");
-  jarSpec += NS_ConvertUTF16toUTF8(appInfo->mPath) +
-             NS_LITERAL_CSTRING("/application.zip!") +
-             fileSpec;
-
-  nsCOMPtr<nsIURI> jarURI;
-  rv = NS_NewURI(getter_AddRefs(jarURI),
-                 jarSpec, nullptr, nullptr);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = channel->Init(jarURI);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // set the loadInfo on the new channel
-  rv = channel->SetLoadInfo(aLoadInfo);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = channel->SetAppURI(aUri);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = channel->SetOriginalURI(aUri);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  channel.forget(aResult);
-  return NS_OK;
-}
-
-// We map app://ABCDEF/path/to/file.ext to
-// jar:file:///path/to/profile/webapps/ABCDEF/application.zip!/path/to/file.ext
-NS_IMETHODIMP
-AppProtocolHandler::NewChannel(nsIURI* aUri, nsIChannel* *aResult)
-{
-  return NewChannel2(aUri, nullptr, aResult);
-}
-
-NS_IMETHODIMP
-AppProtocolHandler::AllowPort(int32_t aPort, const char *aScheme, bool *aRetval)
-{
-  // No port allowed for this scheme.
-  *aRetval = false;
-  return NS_OK;
-}
-
deleted file mode 100644
--- a/netwerk/protocol/app/AppProtocolHandler.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim:set expandtab ts=4 sw=4 sts=4 cin: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef AppProtocolHandler_
-#define AppProtocolHandler_
-
-#include "nsIProtocolHandler.h"
-#include "nsClassHashtable.h"
-#include "mozilla/dom/AppInfoBinding.h"
-
-class AppProtocolHandler : public nsIProtocolHandler
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  // nsIProtocolHandler methods:
-  NS_DECL_NSIPROTOCOLHANDLER
-
-  // AppProtocolHandler methods:
-  AppProtocolHandler();
-
-  // Define a Create method to be used with a factory:
-  static nsresult Create(nsISupports* aOuter,
-                         const nsIID& aIID,
-                         void* *aResult);
-
-private:
-  virtual ~AppProtocolHandler();
-  nsClassHashtable<nsCStringHashKey, mozilla::dom::AppInfo> mAppInfoCache;
-};
-
-#endif /* AppProtocolHandler_ */
deleted file mode 100644
--- a/netwerk/protocol/app/moz.build
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-SOURCES += [
-    'AppProtocolHandler.cpp',
-]
-
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '/caps',
-    '/modules/libjar',
-    '/netwerk/base',
-]
--- a/old-configure.in
+++ b/old-configure.in
@@ -2635,17 +2635,17 @@ MOZ_XUL=1
 MOZ_ZIPWRITER=1
 NS_PRINTING=1
 if test "$MOZ_IOS"; then
    NS_PRINTING=
 fi
 MOZ_NO_SMART_CARDS=
 NSS_DISABLE_DBM=
 NECKO_COOKIES=1
-NECKO_PROTOCOLS_DEFAULT="about app data file ftp http res viewsource websocket wyciwyg device"
+NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource websocket wyciwyg device"
 if test -n "$MOZ_RTSP"; then
   NECKO_PROTOCOLS_DEFAULT="$NECKO_PROTOCOLS_DEFAULT rtsp"
 fi
 BUILD_CTYPES=1
 MOZ_USE_NATIVE_POPUP_WINDOWS=
 MOZ_WEBSMS_BACKEND=
 MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
 MOZ_INSTALL_TRACKING=
author	Alexandre Lissy <lissyx@lissyx.dyndns.org>
	Wed, 16 Mar 2016 17:11:12 +0100
changeset 385370	34fbf026e29199500d37f2f36b32e7d029b0c395
parent 385002	4764b9f8e6d4ef9823237f01ca3901759ce8daeb
child 524915	33d4b119c8755f1a74c5b6a65c711e8eaa773cd5
push id	22489
push user	bmo:lissyx+mozillians@lissyx.dyndns.org
push date	Fri, 08 Jul 2016 08:29:07 +0000
reviewers	valentin
bugs	1285170
milestone	50.0a1
addon-sdk/source/test/test-url.js		file \| annotate \| diff \| comparison \| revisions
devtools/client/performance/test/unit/test_frame-utils-01.js		file \| annotate \| diff \| comparison \| revisions
devtools/shared/apps/moz.build		file \| annotate \| diff \| comparison \| revisions
devtools/shared/apps/tests/unit/.eslintrc		file \| annotate \| diff \| comparison \| revisions
devtools/shared/apps/tests/unit/data/app-engineering.zip		file \| annotate \| diff \| comparison \| revisions
devtools/shared/apps/tests/unit/data/app.zip		file \| annotate \| diff \| comparison \| revisions
devtools/shared/apps/tests/unit/head_apps.js		file \| annotate \| diff \| comparison \| revisions
devtools/shared/apps/tests/unit/tail_apps.js		file \| annotate \| diff \| comparison \| revisions
devtools/shared/apps/tests/unit/test_webappsActor.js		file \| annotate \| diff \| comparison \| revisions
devtools/shared/apps/tests/unit/xpcshell.ini		file \| annotate \| diff \| comparison \| revisions
dom/indexedDB/test/unit/defaultStorageUpgrade_profile.zip		file \| annotate \| diff \| comparison \| revisions
dom/indexedDB/test/unit/idbSubdirUpgrade1_profile.zip		file \| annotate \| diff \| comparison \| revisions
dom/indexedDB/test/unit/idbSubdirUpgrade2_profile.zip		file \| annotate \| diff \| comparison \| revisions
dom/indexedDB/test/unit/schema23upgrade_profile.zip		file \| annotate \| diff \| comparison \| revisions
dom/indexedDB/test/unit/storagePersistentUpgrade_profile.zip		file \| annotate \| diff \| comparison \| revisions
dom/indexedDB/test/unit/test_defaultStorageUpgrade.js		file \| annotate \| diff \| comparison \| revisions
dom/indexedDB/test/unit/test_idbSubdirUpgrade.js		file \| annotate \| diff \| comparison \| revisions
dom/indexedDB/test/unit/test_schema23upgrade.js		file \| annotate \| diff \| comparison \| revisions
dom/indexedDB/test/unit/test_storagePersistentUpgrade.js		file \| annotate \| diff \| comparison \| revisions
netwerk/build/moz.build		file \| annotate \| diff \| comparison \| revisions
netwerk/build/nsNetCID.h		file \| annotate \| diff \| comparison \| revisions
netwerk/build/nsNetModule.cpp		file \| annotate \| diff \| comparison \| revisions
netwerk/ipc/NeckoParent.cpp		file \| annotate \| diff \| comparison \| revisions
netwerk/ipc/NeckoParent.h		file \| annotate \| diff \| comparison \| revisions
netwerk/protocol/app/AppProtocolHandler.cpp		file \| annotate \| diff \| comparison \| revisions
netwerk/protocol/app/AppProtocolHandler.h		file \| annotate \| diff \| comparison \| revisions
netwerk/protocol/app/moz.build		file \| annotate \| diff \| comparison \| revisions
old-configure.in		file \| annotate \| diff \| comparison \| revisions