Stop linking in the old Mojo EDK.

content/common/mojo/channel_init.h

Index: content/common/mojo/channel_init.h
diff --git a/content/common/mojo/channel_init.h b/content/common/mojo/channel_init.h
index acdc5752c95f656043198e70aa3556e9c109cd96..daf8bb839d2dc49cbb23b12f43ce603f17d5bf23 100644
--- a/content/common/mojo/channel_init.h
+++ b/content/common/mojo/channel_init.h
@@ -8,11 +8,9 @@
 #include "base/files/file.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
 #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;
@@ -34,22 +32,11 @@ class CONTENT_EXPORT ChannelInit {
       scoped_refptr<base::TaskRunner> io_thread_task_runner);
 
   // Notifies the channel that we (hence it) will soon be destroyed.
+  // TODO(jam); remove this

[Ben Goodger (Google), 2016/01/12 23:31:00]

nit: colon

   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);
-
-  // If non-null the channel has been established.
-  mojo::embedder::ChannelInfo* channel_info_;
-
   scoped_ptr<IPC::ScopedIPCSupport> ipc_support_;
-  base::WeakPtrFactory<ChannelInit> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelInit);
 };