Revert 274310 "Introduce IPC::ChannelProxy::Create*() and IPC::S..."

trunk/src/remoting/host/ipc_desktop_environment_unittest.cc

 // Copyright (c) 2013 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 349 matching lines @@
     const protocol::ClipboardEvent& event) {
   clipboard_stub_->InjectClipboardEvent(event);
 }
 
 void IpcDesktopEnvironmentTest::CreateDesktopProcess() {
   EXPECT_TRUE(task_runner_.get());
   EXPECT_TRUE(io_task_runner_.get());
 
   // Create the daemon end of the daemon-to-desktop channel.
   desktop_channel_name_ = IPC::Channel::GenerateUniqueRandomChannelID();
-  desktop_channel_ = IPC::ChannelProxy::CreateServer(
-      IPC::ChannelHandle(desktop_channel_name_),
-      &desktop_listener_,
-      io_task_runner_.get());
+  desktop_channel_.reset(
+      new IPC::ChannelProxy(IPC::ChannelHandle(desktop_channel_name_),
+                            IPC::Channel::MODE_SERVER,
+                            &desktop_listener_,
+                            io_task_runner_.get()));
 
   // Create and start the desktop process.
   desktop_process_.reset(new DesktopProcess(task_runner_,
                                             io_task_runner_,
                                             desktop_channel_name_));
 
   scoped_ptr<MockDesktopEnvironmentFactory> desktop_environment_factory(
       new MockDesktopEnvironmentFactory());
   EXPECT_CALL(*desktop_environment_factory, CreatePtr())
       .Times(AnyNumber())
@@ skipping 257 matching lines @@
   screen_controls_->SetScreenResolution(ScreenResolution(
       webrtc::DesktopSize(100, 100),
       webrtc::DesktopVector(96, 96)));
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 }  // namespace remoting