Revert 273575 "Introduce IPC::Channel::Create*() to ensure it be..."

trunk/src/ipc/ipc_send_fds_test.cc

 // 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.
 
 #include "build/build_config.h"
 
 #if defined(OS_POSIX)
 #if defined(OS_MACOSX)
 extern "C" {
 #include <sandbox.h>
@@ skipping 116 matching lines @@
   Init("SendFdsClient");
   RunServer();
 }
 
 int SendFdsClientCommon(const std::string& test_client_name,
                         ino_t expected_inode_num) {
   base::MessageLoopForIO main_message_loop;
   MyChannelDescriptorListener listener(expected_inode_num);
 
   // Set up IPC channel.
-  scoped_ptr<IPC::Channel> channel(IPC::Channel::CreateClient(
-      IPCTestBase::GetChannelName(test_client_name),
-      &listener));
-  CHECK(channel->Connect());
+  IPC::Channel channel(IPCTestBase::GetChannelName(test_client_name),
+                       IPC::Channel::MODE_CLIENT,
+                       &listener);
+  CHECK(channel.Connect());
 
   // Run message loop.
   base::MessageLoop::current()->Run();
 
   // Verify that the message loop was exited due to getting the correct number
   // of descriptors, and not because of the channel closing unexpectedly.
   CHECK(listener.GotExpectedNumberOfDescriptors());
 
   return 0;
 }
@@ skipping 75 matching lines @@
                     base::Callback<void(int)> cb,
                     int fds_to_send) :
       in_thread_(in_thread),
       out_thread_(out_thread),
       cb_listener_(cb, fds_to_send),
       null_listener_(base::Bind(&null_cb), 0) {
   }
 
   void Init() {
     IPC::ChannelHandle in_handle("IN");
-    in = IPC::Channel::CreateServer(in_handle, &null_listener_);
+    in.reset(new IPC::Channel(in_handle,
+                              IPC::Channel::MODE_SERVER,
+                              &null_listener_));
     base::FileDescriptor out_fd(in->TakeClientFileDescriptor(), false);
     IPC::ChannelHandle out_handle("OUT", out_fd);
-    out = IPC::Channel::CreateClient(out_handle, &cb_listener_);
+    out.reset(new IPC::Channel(out_handle,
+                               IPC::Channel::MODE_CLIENT,
+                               &cb_listener_));
     // PostTask the connect calls to make sure the callbacks happens
     // on the right threads.
     in_thread_->message_loop()->PostTask(
         FROM_HERE,
         base::Bind(&PipeChannelHelper::Connect, in.get()));
     out_thread_->message_loop()->PostTask(
         FROM_HERE,
         base::Bind(&PipeChannelHelper::Connect, out.get()));
   }
 
@@ skipping 117 matching lines @@
   base::WaitableEvent received_;
 };
 
 TEST_F(IPCMultiSendingFdsTest, StressTest) {
   Run();
 }
 
 }  // namespace
 
 #endif  // defined(OS_POSIX)