Revert everything related to the relanding.

ipc/ipc_channel_win.h

 // Copyright (c) 2008 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 IPC_IPC_CHANNEL_WIN_H_
 #define IPC_IPC_CHANNEL_WIN_H_
 
 #include "ipc/ipc_channel.h"
 
 #include <queue>
 #include <string>
 
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 
 class NonThreadSafe;
 
 namespace IPC {
 
 class Channel::ChannelImpl : public MessageLoopForIO::IOHandler {
  public:
   // Mirror methods of Channel, see ipc_channel.h for description.
   ChannelImpl(const std::string& channel_id, Mode mode, Listener* listener);
   ~ChannelImpl() { Close(); }
@@ skipping 52 matching lines @@
   ScopedRunnableMethodFactory<ChannelImpl> factory_;
 
   scoped_ptr<NonThreadSafe> thread_check_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelImpl);
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_CHANNEL_WIN_H_