Backing out bug 406857 to wait for red to go away.

toolkit/components/downloads/src/nsDownloadManager.cpp

@@ -2000,14 +2000,9 @@ nsDownload::OnProgressChange64(nsIWebProgress *aWebProgress,
     // Obtain the referrer
     nsresult rv;
     nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
-    nsCOMPtr<nsIURI> referrer = mReferrer;
     if (channel)
       (void)NS_GetReferrerFromChannel(channel, getter_AddRefs(mReferrer));
 
-    // Restore the original referrer if the new one isn't useful
-    if (!mReferrer)
-      mReferrer = referrer;
-
     // If we have a MIME info, we know that exthandler has already added this to
     // the history, but if we do not, we'll have to add it ourselves.
     if (!mMIMEInfo) {

toolkit/mozapps/downloads/tests/browser/Makefile.in

@@ -52,7 +52,6 @@ _BROWSER_FILES = \
   browser_bug_410289.js \
   browser_bug_413985.js \
   browser_bug_416303.js \
-  browser_bug_406857.js \
   $(NULL)
 
 ifneq (,$(filter cocoa, $(MOZ_WIDGET_TOOLKIT)))

toolkit/mozapps/downloads/tests/browser/browser_bug_406857.js

@@ -1,124 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Download Manager UI Test Code.
- *
- * The Initial Developer of the Original Code is
- * Edward Lee <edward.lee@engineering.uiuc.edu>.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-function test()
-{
-  let dm = Cc["@mozilla.org/download-manager;1"].
-           getService(Ci.nsIDownloadManager);
-  let db = dm.DBConnection;
-
-  // Empty any old downloads
-  db.executeSimpleSQL("DELETE FROM moz_downloads");
-
-  let stmt = db.createStatement(
-    "INSERT INTO moz_downloads (source, target, state, referrer) " +
-    "VALUES (?1, ?2, ?3, ?4)");
-
-  // Download from the test http server
-  stmt.bindStringParameter(0, "http://example.com/httpd.js");
-
-  // Download to a temp local file
-  let file = Cc["@mozilla.org/file/directory_service;1"].
-             getService(Ci.nsIProperties).get("TmpD", Ci.nsIFile);
-  file.append("retry");
-  file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0666);
-  stmt.bindStringParameter(1, Cc["@mozilla.org/network/io-service;1"].
-    getService(Ci.nsIIOService).newFileURI(file).spec);
-
-  // Start it as canceled
-  stmt.bindInt32Parameter(2, dm.DOWNLOAD_CANCELED);
-
-  // Add a referrer to make sure it doesn't disappear
-  let referrer = "http://referrer.goes/here";
-  stmt.bindStringParameter(3, referrer);
-
-  // Add it!
-  stmt.execute();
-  stmt.finalize();
-
-  let listener = {
-    onDownloadStateChange: function(aState, aDownload)
-    {
-      switch (aDownload.state) {
-        case dm.DOWNLOAD_DOWNLOADING:
-          ok(aDownload.referrer.spec == referrer, "Got referrer on download");
-          break;
-        case dm.DOWNLOAD_FINISHED:
-          ok(aDownload.referrer.spec == referrer, "Got referrer on finish");
-
-          dm.removeListener(listener);
-          finish();
-          break;
-      }
-    }
-  };
-  dm.addListener(listener);
-
-  // Close the UI if necessary
-  let wm = Cc["@mozilla.org/appshell/window-mediator;1"].
-           getService(Ci.nsIWindowMediator);
-  let win = wm.getMostRecentWindow("Download:Manager");
-  if (win) win.close();
-
-  // Start the test when the download manager window loads
-  let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
-           getService(Ci.nsIWindowWatcher);
-  ww.registerNotification({
-    observe: function(aSubject, aTopic, aData) {
-      ww.unregisterNotification(this);
-      aSubject.QueryInterface(Ci.nsIDOMEventTarget).
-      addEventListener("DOMContentLoaded", doTest, false);
-    }
-  });
-
-  // Let the Startup method of the download manager UI finish before we test
-  let doTest = function() setTimeout(function() {
-    win = wm.getMostRecentWindow("Download:Manager");
-
-    // Try again if selectedIndex is -1
-    if (win.document.getElementById("downloadView").selectedIndex)
-      return doTest();
-
-    // Send the enter key to Download Manager to retry the download
-    EventUtils.synthesizeKey("VK_ENTER", {}, win);
-  }, 0);
- 
-  // Show the Download Manager UI
-  Cc["@mozilla.org/download-manager-ui;1"].
-  getService(Ci.nsIDownloadManagerUI).show();
-
-  waitForExplicitFinish();
-}