From 276d96557354a6a6d5f074f453b2290d9df8f84a Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Thu, 12 Jul 2012 14:49:47 -0700
Subject: [PATCH 1/2] Sync up pdf.js with the mozilla central version.

---
 l10n/en-US/chrome.properties | 1 +
 test/mozcentral/Makefile.in  | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/l10n/en-US/chrome.properties b/l10n/en-US/chrome.properties
index 1885e6036..2b3dce42f 100644
--- a/l10n/en-US/chrome.properties
+++ b/l10n/en-US/chrome.properties
@@ -1,3 +1,4 @@
 # Chrome notification bar messages and buttons
 unsupported_feature=This PDF document might not be displayed correctly.
 open_with_different_viewer=Open With Different Viewer
+open_with_different_viewer.accessKey=o
diff --git a/test/mozcentral/Makefile.in b/test/mozcentral/Makefile.in
index 93ec187e2..ca686d1b4 100644
--- a/test/mozcentral/Makefile.in
+++ b/test/mozcentral/Makefile.in
@@ -9,13 +9,11 @@ VPATH     = @srcdir@
 relativesrcdir  = browser/extensions/pdfjs/test
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_TEST_FILES = \
+MOCHITEST_BROWSER_FILES = \
   browser_pdfjs_main.js \
   browser_pdfjs_savedialog.js \
   file_pdfjs_test.pdf \
   $(NULL)
 
-libs:: $(_BROWSER_TEST_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) 
+include $(topsrcdir)/config/rules.mk

From f16c6f19aa449e6a6c9db672c95b8e39501b1f33 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Fri, 13 Jul 2012 16:14:37 -0700
Subject: [PATCH 2/2] Address moz central comments for ff16.

---
 extensions/firefox/components/PdfStreamConverter.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/extensions/firefox/components/PdfStreamConverter.js b/extensions/firefox/components/PdfStreamConverter.js
index a0057ebb6..d371e50cd 100644
--- a/extensions/firefox/components/PdfStreamConverter.js
+++ b/extensions/firefox/components/PdfStreamConverter.js
@@ -132,16 +132,13 @@ ChromeActions.prototype = {
     var originalUrl = data.originalUrl;
     // The data may not be downloaded so we need just retry getting the pdf with
     // the original url.
-    var blobUrl = data.blobUrl || originalUrl;
-    var originalUri = NetUtil.newURI(originalUrl);
-    var blobUri = NetUtil.newURI(blobUrl);
+    var originalUri = NetUtil.newURI(data.originalUrl);
+    var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri;
     var extHelperAppSvc =
           Cc['@mozilla.org/uriloader/external-helper-app-service;1'].
              getService(Ci.nsIExternalHelperAppService);
     var frontWindow = Cc['@mozilla.org/embedcomp/window-watcher;1'].
                          getService(Ci.nsIWindowWatcher).activeWindow;
-    var ioService = Services.io;
-    var channel = ioService.newChannel(originalUrl, null, null);
 
     NetUtil.asyncFetch(blobUri, function(aInputStream, aResult) {
       if (!Components.isSuccessCode(aResult)) {