Backed out changeset dbee7cf7e96f (bug 1096908) for bustage

browser/devtools/webconsole/test/browser.ini

@@ -307,6 +307,7 @@ skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug intermittent)
 [browser_webconsole_certificate_messages.js]
 skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_show_subresource_security_errors.js]
+skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_cached_autocomplete.js]
 [browser_webconsole_change_font_size.js]
 [browser_webconsole_chrome.js]

netwerk/protocol/http/HttpBaseChannel.h

@@ -182,7 +182,7 @@ public:
   NS_IMETHOD GetAllowAltSvc(bool *aAllowAltSvc) override;
   NS_IMETHOD SetAllowAltSvc(bool aAllowAltSvc) override;
   NS_IMETHOD GetApiRedirectToURI(nsIURI * *aApiRedirectToURI) override;
-  virtual nsresult AddSecurityMessage(const nsAString &aMessageTag, const nsAString &aMessageCategory);
+  nsresult AddSecurityMessage(const nsAString &aMessageTag, const nsAString &aMessageCategory);
   NS_IMETHOD TakeAllSecurityMessages(nsCOMArray<nsISecurityConsoleMessage> &aMessages) override;
   NS_IMETHOD GetResponseTimeoutEnabled(bool *aEnable) override;
   NS_IMETHOD SetResponseTimeoutEnabled(bool aEnable) override;

netwerk/protocol/http/HttpChannelChild.cpp

@@ -991,14 +991,6 @@ HttpChannelChild::DeleteSelf()
   Send__delete__(this);
 }
 
-bool
-HttpChannelChild::RecvReportSecurityMessage(const nsString& messageTag,
-                                            const nsString& messageCategory)
-{
-  AddSecurityMessage(messageTag, messageCategory);
-  return true;
-}
-
 class Redirect1Event : public ChannelEvent
 {
  public:

netwerk/protocol/http/HttpChannelChild.h

@@ -140,9 +140,6 @@ protected:
   bool RecvDivertMessages() override;
   bool RecvDeleteSelf() override;
 
-  bool RecvReportSecurityMessage(const nsString& messageTag,
-                                 const nsString& messageCategory) override;
-
   bool GetAssociatedContentSecurity(nsIAssociatedContentSecurity** res = nullptr);
   virtual void DoNotifyListenerCleanup() override;
 

netwerk/protocol/http/HttpChannelParent.cpp

@@ -329,7 +329,6 @@ HttpChannelParent::DoAsyncOpen(  const URIParams&           aURI,
     return SendFailedAsyncOpen(rv);
 
   mChannel = static_cast<nsHttpChannel *>(channel.get());
-  mChannel->SetWarningReporter(this);
   mChannel->SetTimingEnabled(true);
   if (mPBOverride != kPBOverride_Unset) {
     mChannel->SetPrivate(mPBOverride == kPBOverride_Private ? true : false);
@@ -1265,19 +1264,4 @@ HttpChannelParent::GetAuthPrompt(uint32_t aPromptReason, const nsIID& iid,
   return NS_OK;
 }
 
-//-----------------------------------------------------------------------------
-// HttpChannelSecurityWarningReporter
-//-----------------------------------------------------------------------------
-
-nsresult
-HttpChannelParent::ReportSecurityMessage(const nsAString& aMessageTag,
-                                         const nsAString& aMessageCategory)
-{
-  if (NS_WARN_IF(!SendReportSecurityMessage(nsString(aMessageTag),
-                                            nsString(aMessageCategory)))) {
-    return NS_ERROR_UNEXPECTED;
-  }
-  return NS_OK;
-}
-
 }} // mozilla::net

netwerk/protocol/http/HttpChannelParent.h

@@ -43,8 +43,7 @@ class HttpChannelParent final : public PHttpChannelParent
                               , public ADivertableParentChannel
                               , public nsIAuthPromptProvider
                               , public nsINetworkInterceptController
-                              , public DisconnectableParent,
-                              , public HttpChannelSecurityWarningReporter
+                              , public DisconnectableParent
 {
   virtual ~HttpChannelParent();
 
@@ -155,9 +154,6 @@ protected:
   void OfflineDisconnect() override;
   uint32_t GetAppId() override;
 
-  nsresult ReportSecurityMessage(const nsAString& aMessageTag,
-                                 const nsAString& aMessageCategory) override;
-
 private:
   nsRefPtr<nsHttpChannel>       mChannel;
   nsCOMPtr<nsICacheEntry>       mCacheEntry;

netwerk/protocol/http/PHttpChannel.ipdl

@@ -139,10 +139,6 @@ child:
   // OnDataAvailable and OnStopRequest messages in the queue back to the parent.
   DivertMessages();
 
-  // Report a security message to the console associated with this
-  // channel.
-  ReportSecurityMessage(nsString messageTag, nsString messageCategory);
-
   // Tell child to delete channel (all IPDL deletes must be done from child to
   // avoid races: see bug 591708).
   DeleteSelf();

netwerk/protocol/http/nsHttpChannel.cpp

@@ -244,7 +244,6 @@ nsHttpChannel::nsHttpChannel()
     , mHasAutoRedirectVetoNotifier(0)
     , mPushedStream(nullptr)
     , mLocalBlocklist(false)
-    , mWarningReporter(nullptr)
     , mDidReval(false)
 {
     LOG(("Creating nsHttpChannel [this=%p]\n", this));
@@ -282,19 +281,6 @@ nsHttpChannel::Init(nsIURI *uri,
 
     return rv;
 }
-
-nsresult
-nsHttpChannel::AddSecurityMessage(const nsAString& aMessageTag,
-                                  const nsAString& aMessageCategory)
-{
-    if (mWarningReporter) {
-        return mWarningReporter->ReportSecurityMessage(aMessageTag,
-                                                       aMessageCategory);
-    }
-    return HttpBaseChannel::AddSecurityMessage(aMessageTag,
-                                               aMessageCategory);
-}
-
 //-----------------------------------------------------------------------------
 // nsHttpChannel <private>
 //-----------------------------------------------------------------------------

netwerk/protocol/http/nsHttpChannel.h

@@ -33,14 +33,6 @@ class nsISSLStatus;
 namespace mozilla { namespace net {
 
 class Http2PushedStream;
-
-class HttpChannelSecurityWarningReporter
-{
-public:
-  virtual nsresult ReportSecurityMessage(const nsAString& aMessageTag,
-                                         const nsAString& aMessageCategory) = 0;
-};
-
 //-----------------------------------------------------------------------------
 // nsHttpChannel
 //-----------------------------------------------------------------------------
@@ -149,12 +141,6 @@ public:
     NS_IMETHOD GetResponseStart(mozilla::TimeStamp *aResponseStart) override;
     NS_IMETHOD GetResponseEnd(mozilla::TimeStamp *aResponseEnd) override;
 
-    nsresult AddSecurityMessage(const nsAString& aMessageTag,
-                                const nsAString& aMessageCategory) override;
-
-    void SetWarningReporter(HttpChannelSecurityWarningReporter* aReporter)
-      { mWarningReporter = aReporter; }
-
 public: /* internal necko use only */
 
     void InternalSetUploadStream(nsIInputStream *uploadStream)
@@ -491,9 +477,6 @@ private:
 
     nsCString mUsername;
 
-    // If non-null, warnings should be reported to this object.
-    HttpChannelSecurityWarningReporter* mWarningReporter;
-
 protected:
     virtual void DoNotifyListenerCleanup() override;