Index: content/common/mojo/channel_init.h |
diff --git a/content/common/mojo/channel_init.h b/content/common/mojo/channel_init.h |
index 4c1905329b98eb623dee680e91dde99de790848d..0a46b556afb481190994f9f120d6c14cbc3c97f8 100644 |
--- a/content/common/mojo/channel_init.h |
+++ b/content/common/mojo/channel_init.h |
@@ -13,7 +13,6 @@ |
#include "content/common/content_export.h" |
#include "ipc/mojo/scoped_ipc_support.h" |
#include "mojo/public/cpp/system/message_pipe.h" |
-#include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h" |
namespace base { |
class TaskRunner; |
@@ -35,27 +34,13 @@ class CONTENT_EXPORT ChannelInit { |
scoped_refptr<base::TaskRunner> io_thread_task_runner, |
const base::Callback<void(mojo::ScopedMessagePipeHandle)>& callback); |
- // Notifies the channel that we (hence it) will soon be destroyed. |
- void WillDestroySoon(); |
- |
private: |
- // Invoked on the thread on which this object lives once the channel has been |
- // established. This is a static method that takes a weak pointer to self, |
- // since we want to destroy the channel if we were destroyed first. |
- static void OnCreatedChannel( |
- base::WeakPtr<ChannelInit> self, |
- scoped_ptr<IPC::ScopedIPCSupport> ipc_support, |
- mojo::embedder::ChannelInfo* channel); |
- |
- // Callback used with the new ports EDK on pipe creation. |
+ // Callback called on message pipe creation. |
void OnCreateMessagePipe( |
scoped_ptr<IPC::ScopedIPCSupport> ipc_support, |
const base::Callback<void(mojo::ScopedMessagePipeHandle)>& callback, |
mojo::ScopedMessagePipeHandle pipe); |
- // If non-null the channel has been established. |
- mojo::embedder::ChannelInfo* channel_info_; |
- |
scoped_ptr<IPC::ScopedIPCSupport> ipc_support_; |
base::WeakPtrFactory<ChannelInit> weak_factory_; |