Remove GMP, Plugin and IPC crash reporter hooks.

Stubs will be removed in follow-up

Tag #20.

11 files changed, 6 insertions, 229 deletions

diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index 9e1c7e8cb..532a9a3a4 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -32,7 +32,6 @@
 #include "mozilla/dom/ExternalHelperAppChild.h"
 #include "mozilla/dom/FlyWebPublishedServerIPC.h"
 #include "mozilla/dom/GetFilesHelper.h"
-#include "mozilla/dom/PCrashReporterChild.h"
 #include "mozilla/dom/ProcessGlobal.h"
 #include "mozilla/dom/PushNotifier.h"
 #include "mozilla/dom/workers/ServiceWorkerManager.h"
@@ -1497,19 +1496,6 @@ ContentChild::RecvNotifyEmptyHTTPCache()
   return true;
 }
 
-PCrashReporterChild*
-ContentChild::AllocPCrashReporterChild(const mozilla::dom::NativeThreadId& id,
-                                       const uint32_t& processType)
-{
-    return nullptr;
-}
-
-bool
-ContentChild::DeallocPCrashReporterChild(PCrashReporterChild* crashreporter)
-{
-  delete crashreporter;
-  return true;
-}
 
 PHalChild*
 ContentChild::AllocPHalChild()
diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
index c78f951f0..978dd6357 100644
--- a/dom/ipc/ContentChild.h
+++ b/dom/ipc/ContentChild.h
@@ -186,13 +186,6 @@ public:
 
   virtual bool DeallocPBlobChild(PBlobChild* aActor) override;
 
-  virtual PCrashReporterChild*
-  AllocPCrashReporterChild(const mozilla::dom::NativeThreadId& id,
-                           const uint32_t& processType) override;
-
-  virtual bool
-  DeallocPCrashReporterChild(PCrashReporterChild*) override;
-
   virtual PHalChild* AllocPHalChild() override;
   virtual bool DeallocPHalChild(PHalChild*) override;
 
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 8b9ab4442..eb5550088 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -2953,29 +2953,6 @@ ContentParent::FriendlyName(nsAString& aName, bool aAnonymize)
   }
 }
 
-PCrashReporterParent*
-ContentParent::AllocPCrashReporterParent(const NativeThreadId& tid,
-                                         const uint32_t& processType)
-{
-  return nullptr;
-}
-
-bool
-ContentParent::RecvPCrashReporterConstructor(PCrashReporterParent* actor,
-                                             const NativeThreadId& tid,
-                                             const uint32_t& processType)
-{
-  static_cast<CrashReporterParent*>(actor)->SetChildData(tid, processType);
-  return true;
-}
-
-bool
-ContentParent::DeallocPCrashReporterParent(PCrashReporterParent* crashreporter)
-{
-  delete crashreporter;
-  return true;
-}
-
 hal_sandbox::PHalParent*
 ContentParent::AllocPHalParent()
 {
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index 3f74b10e1..87384e030 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -372,15 +372,6 @@ public:
 
   virtual void OnChannelError() override;
 
-  virtual PCrashReporterParent*
-  AllocPCrashReporterParent(const NativeThreadId& tid,
-                            const uint32_t& processType) override;
-
-  virtual bool
-  RecvPCrashReporterConstructor(PCrashReporterParent* actor,
-                                const NativeThreadId& tid,
-                                const uint32_t& processType) override;
-
   virtual PNeckoParent* AllocPNeckoParent() override;
 
   virtual bool RecvPNeckoConstructor(PNeckoParent* aActor) override
@@ -735,9 +726,6 @@ private:
   RecvPBlobConstructor(PBlobParent* aActor,
                        const BlobConstructorParams& params) override;
 
-  virtual bool
-  DeallocPCrashReporterParent(PCrashReporterParent* crashreporter) override;
-
   virtual bool RecvNSSU2FTokenIsCompatibleVersion(const nsString& aVersion,
                                                   bool* aIsCompatible) override;
 
diff --git a/dom/ipc/CrashReporterChild.cpp b/dom/ipc/CrashReporterChild.cpp
index 8174452e7..d5616a504 100644
--- a/dom/ipc/CrashReporterChild.cpp
+++ b/dom/ipc/CrashReporterChild.cpp
@@ -12,31 +12,6 @@ using mozilla::plugins::PluginModuleChild;
 
 namespace mozilla {
 namespace dom {
-
-/*static*/
-PCrashReporterChild*
-CrashReporterChild::GetCrashReporter()
-{
-  const ManagedContainer<PCrashReporterChild>* reporters = nullptr;
-  switch (XRE_GetProcessType()) {
-    case GeckoProcessType_Content: {
-      ContentChild* child = ContentChild::GetSingleton();
-      reporters = &child->ManagedPCrashReporterChild();
-      break;
-    }
-    case GeckoProcessType_Plugin: {
-      PluginModuleChild* child = PluginModuleChild::GetChrome();
-      reporters = &child->ManagedPCrashReporterChild();
-      break;
-    }
-    default:
-      break;
-  }
-  if (!reporters) {
-    return nullptr;
-  }
-  return LoneManagedOrNullAsserts(*reporters);
-}
-
+  /*** STUB ***/
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/ipc/CrashReporterChild.h b/dom/ipc/CrashReporterChild.h
index 96355ca11..32140a901 100644
--- a/dom/ipc/CrashReporterChild.h
+++ b/dom/ipc/CrashReporterChild.h
@@ -7,25 +7,9 @@
 #ifndef mozilla_dom_CrashReporterChild_h
 #define mozilla_dom_CrashReporterChild_h
 
-#include "mozilla/dom/PCrashReporterChild.h"
-
 namespace mozilla {
 namespace dom {
-
-class CrashReporterChild :
-  public PCrashReporterChild
-{
-public:
-  CrashReporterChild() {
-    MOZ_COUNT_CTOR(CrashReporterChild);
-  }
-  ~CrashReporterChild() {
-    MOZ_COUNT_DTOR(CrashReporterChild);
-  }
-
-  static PCrashReporterChild* GetCrashReporter();
-};
-
+  /*** STUB ***/
 } // namespace dom
 } // namespace mozilla
 
diff --git a/dom/ipc/CrashReporterParent.cpp b/dom/ipc/CrashReporterParent.cpp
index 677b29670..75b0fccb7 100644
--- a/dom/ipc/CrashReporterParent.cpp
+++ b/dom/ipc/CrashReporterParent.cpp
@@ -16,48 +16,7 @@
 namespace mozilla {
 namespace dom {
 
-using namespace mozilla::ipc;
-
-void
-CrashReporterParent::AnnotateCrashReport(const nsCString& key,
-                                         const nsCString& data)
-{
-}
-
-void
-CrashReporterParent::ActorDestroy(ActorDestroyReason aWhy)
-{
-  // Implement me! Bug 1005155
-}
-
-bool
-CrashReporterParent::RecvAppendAppNotes(const nsCString& data)
-{
-  mAppNotes.Append(data);
-  return true;
-}
-
-CrashReporterParent::CrashReporterParent()
-  :
-    mStartTime(::time(nullptr))
-  , mInitialized(false)
-{
-  MOZ_COUNT_CTOR(CrashReporterParent);
-}
-
-CrashReporterParent::~CrashReporterParent()
-{
-  MOZ_COUNT_DTOR(CrashReporterParent);
-}
-
-void
-CrashReporterParent::SetChildData(const NativeThreadId& tid,
-                                  const uint32_t& processType)
-{
-  mInitialized = true;
-  mMainThread = tid;
-  mProcessType = GeckoProcessType(processType);
-}
-
+  /*** STUB ***/
+  
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/ipc/CrashReporterParent.h b/dom/ipc/CrashReporterParent.h
index 71896c5c1..481c4d77b 100644
--- a/dom/ipc/CrashReporterParent.h
+++ b/dom/ipc/CrashReporterParent.h
@@ -7,63 +7,14 @@
 #ifndef mozilla_dom_CrashReporterParent_h
 #define mozilla_dom_CrashReporterParent_h
 
-#include "mozilla/dom/PCrashReporterParent.h"
 #include "mozilla/dom/TabMessageUtils.h"
 #include "nsIFile.h"
 
 namespace mozilla {
 namespace dom {
 
-class CrashReporterParent : public PCrashReporterParent
-{
-public:
-  CrashReporterParent();
-  virtual ~CrashReporterParent();
-
-  /*
-   * Initialize this reporter with data from the child process.
-   */
-  void
-  SetChildData(const NativeThreadId& id, const uint32_t& processType);
-
-  /*
-   * Returns the ID of the child minidump.
-   * GeneratePairedMinidump or GenerateCrashReport must be called first.
-   */
-  const nsString& ChildDumpID() const {
-    return mChildDumpID;
-  }
-
-  /*
-   * Add an annotation to our internally tracked list of annotations.
-   * Callers must apply these notes using GenerateChildData otherwise
-   * the notes will get dropped.
-   */
-  void
-  AnnotateCrashReport(const nsCString& aKey, const nsCString& aData);
-
- protected:
-  virtual void ActorDestroy(ActorDestroyReason aWhy) override;
-
-  virtual bool RecvAnnotateCrashReport(const nsCString& aKey,
-                                       const nsCString& aData) override
-  {
-    AnnotateCrashReport(aKey, aData);
-    return true;
-  }
-
-  virtual bool RecvAppendAppNotes(const nsCString& aData) override;
-
-  nsCString mAppNotes;
-  nsString mChildDumpID;
-  // stores the child main thread id
-  NativeThreadId mMainThread;
-  time_t mStartTime;
-  // stores the child process type
-  GeckoProcessType mProcessType;
-  bool mInitialized;
-};
-
+  /*** STUB ***/
+  
 } // namespace dom
 } // namespace mozilla
 
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index d436c19fe..a914c4cc8 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -11,7 +11,6 @@ include protocol PCompositorBridge;
 include protocol PContentBridge;
 include protocol PContentPermissionRequest;
 include protocol PCycleCollectWithLogs;
-include protocol PCrashReporter;
 include protocol PPSMContentDownloader;
 include protocol PExternalHelperApp;
 include protocol PHandlerService;
@@ -243,7 +242,6 @@ nested(upto inside_cpow) sync protocol PContent
     manages PBlob;
     manages PBrowser;
     manages PContentPermissionRequest;
-    manages PCrashReporter;
     manages PCycleCollectWithLogs;
     manages PPSMContentDownloader;
     manages PExternalHelperApp;
@@ -625,8 +623,6 @@ parent:
 
     async PRemoteSpellcheckEngine();
 
-    sync PCrashReporter(NativeThreadId tid, uint32_t processType);
-
     /**
      * Is this token compatible with the provided version?
      *
diff --git a/dom/ipc/PCrashReporter.ipdl b/dom/ipc/PCrashReporter.ipdl
deleted file mode 100644
index 8f965f2ee..000000000
--- a/dom/ipc/PCrashReporter.ipdl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=80 : 
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-include protocol PContent;
-include protocol PPluginModule;
-include protocol PGMP;
-
-namespace mozilla {
-namespace dom {
-
-struct Mapping {
-  nsCString library_name;
-  nsCString file_id;
-  uintptr_t start_address;
-  size_t mapping_length;
-  size_t file_offset;
-};
-
-async protocol PCrashReporter {
-  manager PContent or PPluginModule or PGMP;
-parent:
-  async AnnotateCrashReport(nsCString key, nsCString data);
-  async AppendAppNotes(nsCString data);
-  async __delete__();
-};
-
-}
-}
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index c34ac5d48..0871f3f23 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -92,7 +92,6 @@ IPDL_SOURCES += [
     'PContentBridge.ipdl',
     'PContentPermission.ipdlh',
     'PContentPermissionRequest.ipdl',
-    'PCrashReporter.ipdl',
     'PCycleCollectWithLogs.ipdl',
     'PFilePicker.ipdl',
     'PMemoryReportRequest.ipdl',