| Index: chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
|
| diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
|
| index 12ecab717f14ec30073f20c5e627b7ee01fb1fc7..7f6987174f7d6bf82fac7ea93964dddd833b174c 100644
|
| --- a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
|
| +++ b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
|
| @@ -268,11 +268,9 @@ int CloudPrintMockService_Main(SetExpectationsCallback set_expectations) {
|
| base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
|
| switches::kProcessChannelID);
|
| scoped_ptr<IPC::ChannelProxy> startup_channel;
|
| - startup_channel =
|
| - IPC::ChannelProxy::Create(startup_channel_name,
|
| - IPC::Channel::MODE_CLIENT,
|
| - &listener,
|
| - service_process.IOMessageLoopProxy());
|
| + startup_channel = IPC::ChannelProxy::Create(
|
| + startup_channel_name, IPC::Channel::MODE_CLIENT, &listener,
|
| + service_process.IOMessageLoopProxy(), nullptr);
|
|
|
| main_message_loop.Run();
|
| if (!Mock::VerifyAndClearExpectations(&server))
|
| @@ -441,10 +439,9 @@ base::Process CloudPrintProxyPolicyStartupTest::Launch(
|
| base::StringPrintf("%d.%p.%d",
|
| base::GetCurrentProcId(), this,
|
| base::RandInt(0, std::numeric_limits<int>::max()));
|
| - startup_channel_ = IPC::ChannelProxy::Create(startup_channel_id_,
|
| - IPC::Channel::MODE_SERVER,
|
| - this,
|
| - IOTaskRunner());
|
| + startup_channel_ =
|
| + IPC::ChannelProxy::Create(startup_channel_id_, IPC::Channel::MODE_SERVER,
|
| + this, IOTaskRunner(), nullptr);
|
|
|
| #if defined(OS_POSIX)
|
| base::FileHandleMappingVector ipc_file_list;
|
| @@ -465,11 +462,9 @@ void CloudPrintProxyPolicyStartupTest::WaitForConnect() {
|
| observer_.Wait();
|
| EXPECT_TRUE(CheckServiceProcessReady());
|
| EXPECT_TRUE(base::ThreadTaskRunnerHandle::Get().get());
|
| - ServiceProcessControl::GetInstance()->SetChannel(
|
| - IPC::ChannelProxy::Create(GetServiceProcessChannel(),
|
| - IPC::Channel::MODE_NAMED_CLIENT,
|
| - ServiceProcessControl::GetInstance(),
|
| - IOTaskRunner()));
|
| + ServiceProcessControl::GetInstance()->SetChannel(IPC::ChannelProxy::Create(
|
| + GetServiceProcessChannel(), IPC::Channel::MODE_NAMED_CLIENT,
|
| + ServiceProcessControl::GetInstance(), IOTaskRunner(), nullptr));
|
| }
|
|
|
| bool CloudPrintProxyPolicyStartupTest::Send(IPC::Message* message) {
|
|
|