Bug 1205138 - Cleanup tracking protection warnings and logs. r=gcp

This commit is contained in:
Francois Marier 2015-09-16 16:42:08 -07:00
parent 5d815e6ce0
commit 783e5028de

View File

@ -130,7 +130,9 @@ nsChannelClassifier::ShouldEnableTrackingProtection(nsIChannel *aChannel,
// scheme, since users who put sites on the allowlist probably don't expect
// allowlisting to depend on scheme.
nsCOMPtr<nsIURL> url = do_QueryInterface(topWinURI, &rv);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
return rv; // normal for some loads, no need to print a warning
}
nsCString escaped(NS_LITERAL_CSTRING("https://"));
nsAutoCString temp;
@ -616,7 +618,7 @@ nsChannelClassifier::OnClassifyComplete(nsresult aErrorCode)
if (aErrorCode == NS_ERROR_TRACKING_URI &&
NS_SUCCEEDED(IsTrackerWhitelisted())) {
LOG(("nsChannelClassifier[%p]:OnClassifyComplete tracker found "
"in whitelist so we won't block it)", this));
"in whitelist so we won't block it", this));
aErrorCode = NS_OK;
}