From 3f8e35ec5f7c2868b02d1170331cf602bcc66d79 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Tue, 17 Mar 2015 09:23:19 -0700
Subject: [PATCH] Bug 1139678 - (Part 2) Update non-reader-able test URL in
 browser_readerMode.js. r=Gijs

--HG--
extra : rebase_source : f37e89e44dbaaf1df46529f66b75b0c7d378b465
---
 browser/base/content/content.js                         | 2 +-
 browser/base/content/test/general/browser_readerMode.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/content.js b/browser/base/content/content.js
index dbaf1f5f0969..0eb5a78491d4 100644
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -490,7 +490,7 @@ let AboutReaderListener = {
   receiveMessage: function(message) {
     switch (message.name) {
       case "Reader:ParseDocument":
-        this._articlePromise = ReaderMode.parseDocument(content.document);
+        this._articlePromise = ReaderMode.parseDocument(content.document).catch(Cu.reportError);
         content.document.location = "about:reader?url=" + encodeURIComponent(message.data.url);
         break;
     }
diff --git a/browser/base/content/test/general/browser_readerMode.js b/browser/base/content/test/general/browser_readerMode.js
index 0892bbe8a04f..599c2bc87141 100644
--- a/browser/base/content/test/general/browser_readerMode.js
+++ b/browser/base/content/test/general/browser_readerMode.js
@@ -71,7 +71,7 @@ add_task(function* () {
 
   // Load a new tab that is NOT reader-able.
   let newTab = gBrowser.selectedTab = gBrowser.addTab();
-  yield promiseTabLoadEvent(newTab, TEST_PATH + "download_page.html");
+  yield promiseTabLoadEvent(newTab, "about:robots");
   yield promiseWaitForCondition(() => readerButton.hidden);
   is_element_hidden(readerButton, "Reader mode button is not present on a non-reader-able page");