summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/browser/plugin_data_remover_impl.cc2
-rw-r--r--content/browser/plugin_service_impl_browsertest.cc2
-rw-r--r--content/common/child_process_host_impl.cc3
-rw-r--r--content/renderer/render_thread_impl_browsertest.cc5
4 files changed, 6 insertions, 6 deletions
diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc
index a318e72..9133e59 100644
--- a/content/browser/plugin_data_remover_impl.cc
+++ b/content/browser/plugin_data_remover_impl.cc
@@ -226,7 +226,7 @@ class PluginDataRemoverImpl::Context
return;
DCHECK(!channel_.get());
- channel_ = IPC::Channel::CreateClient(handle, this);
+ channel_.reset(new IPC::Channel(handle, IPC::Channel::MODE_CLIENT, this));
if (!channel_->Connect()) {
NOTREACHED() << "Couldn't connect to plugin";
SignalDone();
diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc
index 7a3271e..44f4754 100644
--- a/content/browser/plugin_service_impl_browsertest.cc
+++ b/content/browser/plugin_service_impl_browsertest.cc
@@ -60,7 +60,7 @@ class MockPluginProcessHostClient : public PluginProcessHost::Client,
ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
ASSERT_TRUE(set_plugin_info_called_);
ASSERT_TRUE(!channel_);
- channel_ = IPC::Channel::CreateClient(handle, this).release();
+ channel_ = new IPC::Channel(handle, IPC::Channel::MODE_CLIENT, this);
ASSERT_TRUE(channel_->Connect());
}
diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc
index 1dccab0..9ae7c82 100644
--- a/content/common/child_process_host_impl.cc
+++ b/content/common/child_process_host_impl.cc
@@ -164,7 +164,8 @@ void ChildProcessHostImpl::ForceShutdown() {
std::string ChildProcessHostImpl::CreateChannel() {
channel_id_ = IPC::Channel::GenerateVerifiedChannelID(std::string());
- channel_ = IPC::Channel::CreateServer(channel_id_, this);
+ channel_.reset(new IPC::Channel(
+ channel_id_, IPC::Channel::MODE_SERVER, this));
if (!channel_->Connect())
return std::string();
diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc
index 11d486e..6715ef3 100644
--- a/content/renderer/render_thread_impl_browsertest.cc
+++ b/content/renderer/render_thread_impl_browsertest.cc
@@ -57,9 +57,8 @@ TEST_F(RenderThreadImplBrowserTest,
std::string channel_id = IPC::Channel::GenerateVerifiedChannelID(
std::string());
DummyListener dummy_listener;
- scoped_ptr<IPC::Channel> channel(
- IPC::Channel::CreateServer(channel_id, &dummy_listener));
- ASSERT_TRUE(channel->Connect());
+ IPC::Channel channel(channel_id, IPC::Channel::MODE_SERVER, &dummy_listener);
+ ASSERT_TRUE(channel.Connect());
scoped_ptr<MockRenderProcess> mock_process(new MockRenderProcess);
// Owned by mock_process.