Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f"

third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h

Index: third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h
diff --git a/third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h b/third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h
index 961bafac8a8d3b1c79bdb77c1ca88a63aa45369f..2569c4e1b5244dedff8d5a7c2b11f17ab863bc5b 100644
--- a/third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h
+++ b/third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h
@@ -5,109 +5,36 @@
 #ifndef MOJO_EDK_TEST_SCOPED_IPC_SUPPORT_H_
 #define MOJO_EDK_TEST_SCOPED_IPC_SUPPORT_H_
 
-#include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task_runner.h"
-#include "mojo/edk/embedder/master_process_delegate.h"
 #include "mojo/edk/embedder/process_delegate.h"
-#include "mojo/edk/embedder/process_type.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/embedder/slave_process_delegate.h"
 
 namespace mojo {
 namespace test {
 
-namespace internal {
-
-class ScopedIPCSupportHelper {
- public:
-  ScopedIPCSupportHelper();
-  ~ScopedIPCSupportHelper();
-
-  void Init(embedder::ProcessType process_type,
-            embedder::ProcessDelegate* process_delegate,
-            scoped_refptr<base::TaskRunner> io_thread_task_runner,
-            embedder::ScopedPlatformHandle platform_handle);
-
-  void OnShutdownCompleteImpl();
-
- private:
-  scoped_refptr<base::TaskRunner> io_thread_task_runner_;
-
-  // Set after shut down.
-  base::WaitableEvent event_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedIPCSupportHelper);
-};
-
-}  // namespace internal
-
 // A simple class that calls |mojo::embedder::InitIPCSupport()| (with
 // |ProcessType::NONE|) on construction and |ShutdownIPCSupport()| on
 // destruction (or |ShutdownIPCSupportOnIOThread()| if destroyed on the I/O
 // thread).
+// TODO(vtl): Need master/slave versions.
 class ScopedIPCSupport : public embedder::ProcessDelegate {
  public:
-  explicit ScopedIPCSupport(
-      scoped_refptr<base::TaskRunner> io_thread_task_runner);
+  ScopedIPCSupport(scoped_refptr<base::TaskRunner> io_thread_task_runner);
   ~ScopedIPCSupport() override;
 
  private:
-  // |ProcessDelegate| implementation:
-  // Note: Executed on the I/O thread.
-  void OnShutdownComplete() override;
-
-  internal::ScopedIPCSupportHelper helper_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedIPCSupport);
-};
-
-// Like |ScopedIPCSupport|, but with |ProcessType::MASTER|. It will (optionally)
-// call a callback (on the I/O thread) on receiving |OnSlaveDisconnect()|.
-class ScopedMasterIPCSupport : public embedder::MasterProcessDelegate {
- public:
-  explicit ScopedMasterIPCSupport(
-      scoped_refptr<base::TaskRunner> io_thread_task_runner);
-  ScopedMasterIPCSupport(
-      scoped_refptr<base::TaskRunner> io_thread_task_runner,
-      base::Callback<void(embedder::SlaveInfo slave_info)> on_slave_disconnect);
-  ~ScopedMasterIPCSupport() override;
-
- private:
-  // |MasterProcessDelegate| implementation:
+  // ProcessDelegate| implementation:
   // Note: Executed on the I/O thread.
   void OnShutdownComplete() override;
-  void OnSlaveDisconnect(embedder::SlaveInfo slave_info) override;
-
-  internal::ScopedIPCSupportHelper helper_;
-  base::Callback<void(embedder::SlaveInfo slave_info)> on_slave_disconnect_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedMasterIPCSupport);
-};
 
-// Like |ScopedIPCSupport|, but with |ProcessType::SLAVE|. It will (optionally)
-// call a callback (on the I/O thread) on receiving |OnMasterDisconnect()|.
-class ScopedSlaveIPCSupport : public embedder::SlaveProcessDelegate {
- public:
-  ScopedSlaveIPCSupport(scoped_refptr<base::TaskRunner> io_thread_task_runner,
-                        embedder::ScopedPlatformHandle platform_handle);
-  ScopedSlaveIPCSupport(scoped_refptr<base::TaskRunner> io_thread_task_runner,
-                        embedder::ScopedPlatformHandle platform_handle,
-                        base::Closure on_master_disconnect);
-  ~ScopedSlaveIPCSupport() override;
-
- private:
-  // |SlaveProcessDelegate| implementation:
-  // Note: Executed on the I/O thread.
-  void OnShutdownComplete() override;
-  void OnMasterDisconnect() override;
+  scoped_refptr<base::TaskRunner> io_thread_task_runner_;
 
-  internal::ScopedIPCSupportHelper helper_;
-  base::Closure on_master_disconnect_;
+  // Set after shut down.
+  base::WaitableEvent event_;
 
-  DISALLOW_COPY_AND_ASSIGN(ScopedSlaveIPCSupport);
+  DISALLOW_COPY_AND_ASSIGN(ScopedIPCSupport);
 };
 
 }  // namespace test