Revert of ChannelMojo: Ensure that it always has ScopedIPCSupport

content/child/child_thread_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_CHILD_CHILD_THREAD_IMPL_H_
 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 217 matching lines @@
   void OnProcessBackgrounded(bool background);
 #ifdef IPC_MESSAGE_LOG_ENABLED
   void OnSetIPCLoggingEnabled(bool enable);
 #endif
 #if defined(USE_TCMALLOC)
   void OnGetTcmallocStats();
 #endif
 
   void EnsureConnected();
 
+  class SingleProcessChannelDelegate;
+  class SingleProcessChannelDelegateDeleter {
+   public:
+    void operator()(SingleProcessChannelDelegate* delegate) const;
+  };
+
+  scoped_ptr<IPC::ScopedIPCSupport> ipc_support_;
+  scoped_ptr<SingleProcessChannelDelegate, SingleProcessChannelDelegateDeleter>
+      single_process_channel_delegate_;
   scoped_ptr<MojoApplication> mojo_application_;
 
   std::string channel_name_;
   scoped_ptr<IPC::SyncChannel> channel_;
 
   // Allows threads other than the main thread to send sync messages.
   scoped_refptr<IPC::SyncMessageFilter> sync_message_filter_;
 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
@@ skipping 80 matching lines @@
 
  private:
   struct Options options_;
 
   DISALLOW_COPY_AND_ASSIGN(Builder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_CHILD_THREAD_IMPL_H_