From 8ce4db1dc1caa507609f64f73957971db79afbac Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mar.castelluccio@studenti.unina.it>
Date: Tue, 27 Aug 2013 14:58:46 -0400
Subject: [PATCH] Bug 908923 - Get rid of ContentPolicy.js in webapprt/. r=myk

---
 webapprt/ContentPolicy.js    | 40 ------------------------------------
 webapprt/components.manifest |  9 --------
 webapprt/moz.build           |  1 -
 3 files changed, 50 deletions(-)
 delete mode 100644 webapprt/ContentPolicy.js

diff --git a/webapprt/ContentPolicy.js b/webapprt/ContentPolicy.js
deleted file mode 100644
index 8f1c0eb4a08..00000000000
--- a/webapprt/ContentPolicy.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 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/. */
-
-/* We used to use this component to heuristically determine which links to
- * direct to the user's default browser, but we no longer use that heuristic.
- * It will come in handy when we implement support for trusted apps, however,
- * so we left it in (although it is disabled in the manifest).
-*/
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-function ContentPolicy() {}
-
-ContentPolicy.prototype = {
-  classID: Components.ID("{75acd178-3d5a-48a7-bd92-fba383520ae6}"),
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy]),
-
-  shouldLoad: function(contentType, contentLocation, requestOrigin, context, mimeTypeGuess, extra) {
-
-    return Ci.nsIContentPolicy.ACCEPT;
-
-    // When rejecting a load due to a content policy violation, use this code
-    // to close the window opened by window.open, if any.
-    //if (context.currentURI.spec == "about:blank") {
-    //  context.ownerDocument.defaultView.close();
-    //};
-  },
-
-  shouldProcess: function(contentType, contentLocation, requestOrigin, context, mimeType, extra) {
-    return Ci.nsIContentPolicy.ACCEPT;
-  },
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPolicy]);
diff --git a/webapprt/components.manifest b/webapprt/components.manifest
index d425f0a507a..41f77977f22 100644
--- a/webapprt/components.manifest
+++ b/webapprt/components.manifest
@@ -7,15 +7,6 @@ category command-line-handler x-default @mozilla.org/webapprt/clh;1
 component {07ef5b2e-88fb-47bd-8cec-d3b0bef11ac4} ContentPermission.js
 contract @mozilla.org/content-permission/prompt;1 {07ef5b2e-88fb-47bd-8cec-d3b0bef11ac4}
 
-# ContentPolicy.js
-# We used to use this component to heuristically determine which links to
-# direct to the user's default browser, but we no longer use that heuristic.
-# It will come in handy when we implement support for trusted apps, however,
-# so we left it in (although it is disabled here).
-# component {75acd178-3d5a-48a7-bd92-fba383520ae6} ContentPolicy.js
-# contract @mozilla.org/webapprt/content-policy;1 {75acd178-3d5a-48a7-bd92-fba383520ae6}
-# category content-policy webapprt-content-policy @mozilla.org/webapprt/content-policy;1
-
 # DirectoryProvider.js
 component {e1799fda-4b2f-4457-b671-e0641d95698d} DirectoryProvider.js
 contract @mozilla.org/webapprt/directory-provider;1 {e1799fda-4b2f-4457-b671-e0641d95698d}
diff --git a/webapprt/moz.build b/webapprt/moz.build
index e98a52a7e4f..efdebb2a5a8 100644
--- a/webapprt/moz.build
+++ b/webapprt/moz.build
@@ -17,7 +17,6 @@ TEST_DIRS += ['test']
 EXTRA_COMPONENTS += [
     'CommandLineHandler.js',
     'ContentPermission.js',
-    'ContentPolicy.js',
     'DirectoryProvider.js',
     'components.manifest',
 ]