Revert of Update mojo sdk to rev afb4440fd5a10cba980878c326180b7ad7960480

mojo/edk/system/channel.h

Index: mojo/edk/system/channel.h
diff --git a/mojo/edk/system/channel.h b/mojo/edk/system/channel.h
index 715d1f2ce749edfa10b250ead5a47d813d0052ec..6697965615f00208570fb2e074380acf04e14cf2 100644
--- a/mojo/edk/system/channel.h
+++ b/mojo/edk/system/channel.h
@@ -32,7 +32,6 @@
 namespace system {
 
 class ChannelEndpoint;
-class ChannelManager;
 
 // This class is mostly thread-safe. It must be created on an I/O thread.
 // |Init()| must be called on that same thread before it becomes thread-safe (in
@@ -62,11 +61,6 @@
   // failure, no other methods should be called (including |Shutdown()|).
   bool Init(scoped_ptr<RawChannel> raw_channel);
 
-  // Sets the channel manager associated with this channel. This should be set
-  // at most once and only called before |WillShutdownSoon()| (and
-  // |Shutdown()|).
-  void SetChannelManager(ChannelManager* channel_manager);
-
   // This must be called on the creation thread before destruction (which can
   // happen on any thread).
   void Shutdown();
@@ -75,8 +69,6 @@
   // thread, unlike |Shutdown()|). Warnings will be issued if, e.g., messages
   // are written after this is called; other warnings may be suppressed. (This
   // may be called multiple times, or not at all.)
-  //
-  // If set, the channel manager associated with this channel will be reset.
   void WillShutdownSoon();
 
   // Attaches the given endpoint to this channel and runs it. |is_bootstrap|
@@ -183,9 +175,6 @@
   // Set when |WillShutdownSoon()| is called.
   bool is_shutting_down_;
 
-  // Has a reference to us.
-  ChannelManager* channel_manager_;
-
   typedef base::hash_map<ChannelEndpointId, scoped_refptr<ChannelEndpoint>>
       IdToEndpointMap;
   // Map from local IDs to endpoints. If the endpoint is null, this means that