Bug 740795 part A - file moves for pdf.js not being shipped as an extension, r=bsmedberg

--HG--
rename : browser/app/profile/extensions/uriloader@pdf.js/LICENSE => browser/extensions/pdfjs/LICENSE
rename : browser/app/profile/extensions/uriloader@pdf.js/README.mozilla => browser/extensions/pdfjs/README.mozilla
rename : browser/app/profile/extensions/uriloader@pdf.js/bootstrap.js => browser/extensions/pdfjs/bootstrap.js
rename : browser/app/profile/extensions/uriloader@pdf.js/components/PdfStreamConverter.js => browser/extensions/pdfjs/components/PdfStreamConverter.js
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/debugger.js => browser/extensions/pdfjs/content/web/debugger.js
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/bookmark.svg => browser/extensions/pdfjs/content/web/images/bookmark.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/check.svg => browser/extensions/pdfjs/content/web/images/check.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/comment.svg => browser/extensions/pdfjs/content/web/images/comment.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/document-print.svg => browser/extensions/pdfjs/content/web/images/document-print.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/download.svg => browser/extensions/pdfjs/content/web/images/download.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/go-down.svg => browser/extensions/pdfjs/content/web/images/go-down.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/go-up.svg => browser/extensions/pdfjs/content/web/images/go-up.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/loading-icon.gif => browser/extensions/pdfjs/content/web/images/loading-icon.gif
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/nav-outline.svg => browser/extensions/pdfjs/content/web/images/nav-outline.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/nav-thumbs.svg => browser/extensions/pdfjs/content/web/images/nav-thumbs.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/pin-down.svg => browser/extensions/pdfjs/content/web/images/pin-down.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/pin-up.svg => browser/extensions/pdfjs/content/web/images/pin-up.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/zoom-in.svg => browser/extensions/pdfjs/content/web/images/zoom-in.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/zoom-out.svg => browser/extensions/pdfjs/content/web/images/zoom-out.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer-snippet-firefox-extension.html => browser/extensions/pdfjs/content/web/viewer-snippet-firefox-extension.html
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.css => browser/extensions/pdfjs/content/web/viewer.css
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.html => browser/extensions/pdfjs/content/web/viewer.html
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.js => browser/extensions/pdfjs/content/web/viewer.js
rename : browser/app/profile/extensions/uriloader@pdf.js/extension-files => browser/extensions/pdfjs/extension-files
rename : browser/app/profile/extensions/uriloader@pdf.js/icon.png => browser/extensions/pdfjs/icon.png
rename : browser/app/profile/extensions/uriloader@pdf.js/icon64.png => browser/extensions/pdfjs/icon64.png
rename : browser/app/profile/extensions/uriloader@pdf.js/install.rdf.in => browser/extensions/pdfjs/install.rdf.in
rename : browser/app/profile/extensions/uriloader@pdf.js/test/Makefile.in => browser/extensions/pdfjs/test/Makefile.in
rename : browser/app/profile/extensions/uriloader@pdf.js/test/browser_pdfjs_main.js => browser/extensions/pdfjs/test/browser_pdfjs_main.js
rename : browser/app/profile/extensions/uriloader@pdf.js/test/file_pdfjs_test.pdf => browser/extensions/pdfjs/test/file_pdfjs_test.pdf
extra : rebase_source : 631c4970e6dc84d2ab2741c551482bed0ec8ed92

browser/app/profile/extensions/Makefile.in

@@ -46,7 +46,6 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = \
   {972ce4c6-7e08-4474-a285-3208198ce6fd} \
-  uriloader@pdf.js \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

browser/app/profile/extensions/uriloader@pdf.js/Makefile.in

@@ -1,30 +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/.
-
-DEPTH      = ../../../../..
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-APPEXT = $(call core_abspath,$(DIST))/bin/extensions
-
-TEST_DIRS += test
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-# Using the extension-files as an extension files whitelist to avoid noise
-# in the xpi file such as MOZILLA.readme, install.pdf.in and this make file.
-FILES := $(shell cat $(srcdir)/extension-files)
-
-libs::
-	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf.in > install.rdf
-	$(ZIP) -9X $(APPEXT)/uriloader@pdf.js.xpi install.rdf
-	cd $(call core_abspath,$(srcdir)) && \
-	$(ZIP) -9X $(APPEXT)/uriloader@pdf.js.xpi $(FILES)
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(APPEXT)/uriloader@pdf.js.xpi $(DESTDIR)$(mozappdir)/extensions
-
-GARBAGE += install.rdf

browser/extensions/pdfjs/chrome.manifest

@@ -0,0 +1,3 @@
+resource pdf.js content/
+component {6457a96b-2d68-439a-bcfa-44465fbcdbb1} components/PdfStreamConverter.js
+contract @mozilla.org/streamconv;1?from=application/pdf&to=*/* {6457a96b-2d68-439a-bcfa-44465fbcdbb1}

browser/extensions/pdfjs/test/Makefile.in

@@ -2,11 +2,11 @@
 # 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/.
 
-DEPTH     = ../../../../../..
+DEPTH     = ../../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = browser/app/profile/extensions/uriloader@pdf.js/test
+relativesrcdir  = browser/features/pdfjs/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk

browser/extensions/pdfjs/test/browser_pdfjs_main.js

@@ -2,25 +2,12 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-const RELATIVE_DIR = "browser/app/profile/extensions/uriloader@pdf.js/test/";
+const RELATIVE_DIR = "browser/features/pdfjs/test/";
 const TESTROOT = "http://example.com/browser/" + RELATIVE_DIR;
 
 function test() {
   waitForExplicitFinish();
 
-  AddonManager.getAddonByID("uriloader@pdf.js", function(aAddon) {
-    is(aAddon.userDisabled, true, 'Pdf.js addon must be disabled by default');
-    aAddon.userDisabled = false;
-
-    registerCleanupFunction(function() {
-      aAddon.userDisabled = true;
-    });
-
-    continueTest();
-  });
-}
-
-function continueTest() {
   var tab = gBrowser.addTab(TESTROOT + "file_pdfjs_test.pdf");
   var newTabBrowser = gBrowser.getBrowserForTab(tab);
   newTabBrowser.addEventListener("load", function onLoad() {

browser/installer/package-manifest.in

@@ -476,9 +476,10 @@
 ; [Browser Chrome Files]
 @BINPATH@/chrome/browser@JAREXT@
 @BINPATH@/chrome/browser.manifest
++@BINPATH@/chrome/pdfjs/*
++@BINPATH@/chrome/pdfjs.manifest
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
-@BINPATH@/extensions/uriloader@pdf.js.xpi
 #ifdef SHIP_FEEDBACK
 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
 #endif