trunk/src/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc - Issue 312553004: Revert 274310 "Introduce IPC::ChannelProxy::Create*() and IPC::S..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc

Issue 312553004: Revert 274310 "Introduce IPC::ChannelProxy::Create*() and IPC::S..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « trunk/src/apps/app_shim/chrome_main_app_mode_mac.mm ('k') | trunk/src/chrome/browser/service_process/service_process_control.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc

===================================================================

--- trunk/src/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc (revision 274314)

+++ trunk/src/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc (working copy)

@@ -266,10 +266,11 @@

CommandLine::ForCurrentProcess()->GetSwitchValueASCII(

switches::kProcessChannelID);

scoped_ptr<IPC::ChannelProxy> startup_channel;

- startup_channel = IPC::ChannelProxy::CreateClient(

- startup_channel_name,

- &listener,

- service_process.IOMessageLoopProxy());

+ startup_channel.reset(

+ new IPC::ChannelProxy(startup_channel_name,

+ IPC::Channel::MODE_CLIENT,

+ &listener,

+ service_process.IOMessageLoopProxy()));

main_message_loop.Run();

if (!Mock::VerifyAndClearExpectations(&server))

@@ -441,8 +442,9 @@

base::StringPrintf("%d.%p.%d",

base::GetCurrentProcId(), this,

base::RandInt(0, std::numeric_limits<int>::max()));

- startup_channel_ = IPC::ChannelProxy::CreateServer(

- startup_channel_id_, this, IOMessageLoopProxy());

+ startup_channel_.reset(new IPC::ChannelProxy(

+ startup_channel_id_, IPC::Channel::MODE_SERVER,

+ this, IOMessageLoopProxy()));

#if defined(OS_POSIX)

base::FileHandleMappingVector ipc_file_list;

@@ -464,10 +466,10 @@

EXPECT_TRUE(CheckServiceProcessReady());

EXPECT_TRUE(base::MessageLoopProxy::current().get());

ServiceProcessControl::GetInstance()->SetChannel(

- IPC::ChannelProxy::CreateNamedClient(

- GetServiceProcessChannel(),

- ServiceProcessControl::GetInstance(),

- IOMessageLoopProxy()));

+ new IPC::ChannelProxy(GetServiceProcessChannel(),

+ IPC::Channel::MODE_NAMED_CLIENT,

+ ServiceProcessControl::GetInstance(),

+ IOMessageLoopProxy()));

}

bool CloudPrintProxyPolicyStartupTest::Send(IPC::Message* message) {