rename from browser/base/content/test/trackingUI/benignPage.htmlrename to browser/base/content/test/general/benignPage.html

--- a/browser/base/content/test/general/browser.ini+++ b/browser/base/content/test/general/browser.ini@@ -455,16 +455,54 @@ support-files = # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. [browser_tabs_isActive.js] # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. [browser_tabs_owner.js] # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. [browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js] run-if = e10s # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.+[browser_trackingUI_1.js]+tags = trackingprotection+support-files =+ trackingPage.html+ benignPage.html+# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.+[browser_trackingUI_2.js]+tags = trackingprotection+support-files =+ trackingPage.html+ benignPage.html+# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.+[browser_trackingUI_3.js]+tags = trackingprotection+# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.+[browser_trackingUI_4.js]+tags = trackingprotection+support-files =+ trackingPage.html+ benignPage.html+# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.+[browser_trackingUI_5.js]+tags = trackingprotection+support-files =+ trackingPage.html+# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.+[browser_trackingUI_6.js]+tags = trackingprotection+support-files =+ file_trackingUI_6.html+ file_trackingUI_6.js+ file_trackingUI_6.js^headers^+# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.+[browser_trackingUI_telemetry.js]+tags = trackingprotection+support-files =+ trackingPage.html+# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. [browser_typeAheadFind.js] # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. [browser_unknownContentType_title.js] # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. [browser_unloaddialogs.js] # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. [browser_utilityOverlay.js] # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

--- a/netwerk/base/nsChannelClassifier.h+++ b/netwerk/base/nsChannelClassifier.h@@ -75,18 +75,16 @@ private: // Helper function so that we ensure we call ContinueBeginConnect once // Start is called. Returns NS_OK if and only if we will get a callback // from the classifier service. nsresult StartInternal(); // Helper function to check a URI against the hostname whitelist bool IsHostnameWhitelisted(nsIURI *aUri, const nsACString &aWhitelisted); // Checks that the channel was loaded by the URI currently loaded in aDoc static bool SameLoadingURI(nsIDocument *aDoc, nsIChannel *aChannel);- // Helper function to get the (not necessarily top-level) window from a channel.- static nsPIDOMWindowOuter* GetWindowForChannel(nsIChannel *aChannel); // Note this function will be also used to decide whether or not to enable // channel annotation. When |aAnnotationsOnly| is true, this function // is called by ShouldEnableTrackingAnnotation(). Otherwise, this is called // by ShouldEnableTrackingProtection(). nsresult ShouldEnableTrackingProtectionInternal(nsIChannel *aChannel, bool aAnnotationsOnly, bool *result);