8 files changed, 0 insertions, 132 deletions
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index c9aae3841..75682b953 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -651,10 +651,6 @@
 @RESPATH@/browser/chrome.manifest
 @RESPATH@/browser/chrome/browser@JAREXT@
 @RESPATH@/browser/chrome/browser.manifest
-#ifdef NIGHTLY_BUILD
-@RESPATH@/browser/chrome/shumway.manifest
-@RESPATH@/browser/chrome/shumway/*
-#endif
 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 @RESPATH@/chrome/toolkit@JAREXT@
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 435c76400..87fbf8305 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -568,11 +568,6 @@ pref("media.fragmented-mp4.android-media-codec.preferred", true);
 // optimize images memory usage
 pref("image.mem.decodeondraw", true);
 
-#ifdef NIGHTLY_BUILD
-// Shumway component (SWF player) is disabled by default. Also see bug 904346.
-pref("shumway.disabled", true);
-#endif
-
 // enable touch events interfaces
 pref("dom.w3c_touch_events.enabled", 1);
 
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index fdb88062d..2d3fe3cc3 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -82,11 +82,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "uuidgen",
 XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
                                   "resource://gre/modules/SimpleServiceDiscovery.jsm");
 
-if (AppConstants.NIGHTLY_BUILD) {
-  XPCOMUtils.defineLazyModuleGetter(this, "ShumwayUtils",
-                                    "resource://shumway/ShumwayUtils.jsm");
-}
-
 XPCOMUtils.defineLazyModuleGetter(this, "WebappManager",
                                   "resource://gre/modules/WebappManager.jsm");
 
@@ -481,9 +476,6 @@ var BrowserApp = {
     if (AppConstants.ACCESSIBILITY) {
       AccessFu.attach(window);
     }
-    if (AppConstants.NIGHTLY_BUILD) {
-      ShumwayUtils.init();
-    }
 
     let url = null;
     if ("arguments" in window) {
diff --git a/mobile/android/extensions/Makefile.in b/mobile/android/extensions/Makefile.in
deleted file mode 100644
index ce29ad6a7..000000000
--- a/mobile/android/extensions/Makefile.in
+++ /dev/null
@@ -1,27 +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/.
-
-include $(topsrcdir)/config/rules.mk
-
-SHUMWAY_BROWSER_EXTENSION = $(topsrcdir)/browser/extensions/shumway
-
-exclude_files = \
-  test \
-  $(NULL)
-
-ifdef NIGHTLY_BUILD
-$(FINAL_TARGET)/chrome/shumway.manifest: $(GLOBAL_DEPS)
-	$(call py_action,buildlist,$@ "manifest shumway/chrome.manifest")
-
-libs:: $(SHUMWAY_BROWSER_EXTENSION) $(GLOBAL_DEPS)
-	$(PYTHON) $(topsrcdir)/config/nsinstall.py \
-	  $(SHUMWAY_BROWSER_EXTENSION) \
-          $(foreach exclude,$(exclude_files), -X $(SHUMWAY_BROWSER_EXTENSION)/$(exclude)) \
-          $(FINAL_TARGET)/chrome
-
-libs:: $(FINAL_TARGET)/chrome/shumway.manifest
-	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest "manifest chrome/shumway.manifest")
-endif
-
-
diff --git a/mobile/android/extensions/moz.build b/mobile/android/extensions/moz.build
deleted file mode 100644
index 895d11993..000000000
--- a/mobile/android/extensions/moz.build
+++ /dev/null
@@ -1,6 +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/.
-
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index e8bf5cae6..1f46a351d 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -465,10 +465,6 @@
 ; [Browser Chrome Files]
 @BINPATH@/chrome/browser@JAREXT@
 @BINPATH@/chrome/browser.manifest
-#ifdef NIGHTLY_BUILD
-@BINPATH@/chrome/shumway.manifest
-@BINPATH@/chrome/shumway/*
-#endif
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
diff --git a/mobile/android/moz.build b/mobile/android/moz.build
index e936c3bf7..9aaf8ab8d 100644
--- a/mobile/android/moz.build
+++ b/mobile/android/moz.build
@@ -23,7 +23,6 @@ DIRS += [
     'app',
     'fonts',
     'goannaview_library',
-    'extensions',
 ]
 
 if not CONFIG['LIBXUL_SDK']:
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 53c3bac10..7c0a6e7a7 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -4846,83 +4846,6 @@
     "n_buckets": 202,
     "description": "Size (in bytes) of the compressed crash store JSON file."
   },
-  "SHUMWAY_TIME_TO_VIEW_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": "2 * 60 * 1000",
-    "n_buckets": 50,
-    "description": "Time spent to display first frame (ms)"
-  },
-  "SHUMWAY_PARSING_MS": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "high": "2 * 60 * 1000",
-    "n_buckets": 50,
-    "description": "Time spent to parse SWF file (ms)"
-  },
-  "SHUMWAY_SWF_INDEX_ON_PAGE": {
-    "expires_in_version": "40",
-    "kind": "enumerated",
-    "n_values": 30,
-    "description": "Index of the SWF on the page (0 - full page, 1 - first, 2 - second, etc.)"
-  },
-  "SHUMWAY_SWF_SIZE_KB": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "low": "1",
-    "high": "256 * 1024",
-    "n_buckets": 50,
-    "description": "The SWF file size (KB)"
-  },
-  "SHUMWAY_SWF_VERSION": {
-    "expires_in_version": "40",
-    "kind": "enumerated",
-    "n_values": 30,
-    "description": "The SWF file version"
-  },
-  "SHUMWAY_SWF_FRAME_RATE": {
-    "expires_in_version": "40",
-    "kind": "linear",
-    "high": "256",
-    "n_buckets": "50",
-    "description": "The SWF file frame rate"
-  },
-  "SHUMWAY_SWF_AREA": {
-    "expires_in_version": "40",
-    "kind": "exponential",
-    "low": "256",
-    "high": "16777216",
-    "n_buckets": 50,
-    "description": "The SWF file dimension: amount of pixels (width * height)"
-  },
-  "SHUMWAY_SWF_AVM2": {
-    "expires_in_version": "40",
-    "kind": "boolean",
-    "description": "The AVM2 is enabled in the SWF file"
-  },
-  "SHUMWAY_SWF_BANNER": {
-    "expires_in_version": "40",
-    "kind": "enumerated",
-    "n_values": 30,
-    "description": "The well-known banner size"
-  },
-  "SHUMWAY_ERROR": {
-    "expires_in_version": "default",
-    "kind": "enumerated",
-    "n_values": 3,
-    "description": "The Shumway reported error: 0 - unknown, 1 - AVM1, 2 - AVM2)"
-  },
-  "SHUMWAY_FEATURE_USED": {
-    "expires_in_version": "default",
-    "kind": "enumerated",
-    "n_values": 700,
-    "description": "The Shumway feature is used during movie execution"
-  },
-  "SHUMWAY_FALLBACK": {
-    "expires_in_version": "default",
-    "kind": "boolean",
-    "description": "The Shumway was selected to fallback to the Flash (false - by heuristics, true - by user)"
-  },
   "PLUGINS_NOTIFICATION_SHOWN": {
     "expires_in_version": "never",
     "kind": "boolean",