| 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 aab679e570ca3802ef73bfa2d14d7666b4989459..1ab10361a2bd78de6a4ce22d4c646c3e3bd28363 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
|
| @@ -52,7 +52,6 @@
|
| #include "ipc/ipc_channel_mojo.h"
|
| #include "ipc/ipc_descriptors.h"
|
| #include "ipc/ipc_multiprocess_test.h"
|
| -#include "ipc/ipc_switches.h"
|
| #include "mojo/edk/embedder/embedder.h"
|
| #include "mojo/edk/embedder/named_platform_handle.h"
|
| #include "mojo/edk/embedder/named_platform_handle_utils.h"
|
| @@ -117,6 +116,8 @@ void ConnectOnBlockingPool(mojo::ScopedMessagePipeHandle handle,
|
| std::move(handle));
|
| }
|
|
|
| +const char kProcessChannelID[] = "process-channel-id";
|
| +
|
| } // namespace
|
|
|
| class TestServiceProcess : public ServiceProcess {
|
| @@ -288,10 +289,10 @@ int CloudPrintMockService_Main(SetExpectationsCallback set_expectations) {
|
| // continue.
|
| TestStartupClientChannelListener listener;
|
| EXPECT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kProcessChannelID));
|
| + kProcessChannelID));
|
| std::string startup_channel_name =
|
| base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
|
| - switches::kProcessChannelID);
|
| + kProcessChannelID);
|
| std::unique_ptr<IPC::ChannelProxy> startup_channel;
|
| startup_channel =
|
| IPC::ChannelProxy::Create(startup_channel_name,
|
| @@ -523,7 +524,7 @@ void CloudPrintProxyPolicyStartupTest::OnChannelConnected(int32_t peer_pid) {
|
| base::CommandLine CloudPrintProxyPolicyStartupTest::MakeCmdLine(
|
| const std::string& procname) {
|
| base::CommandLine cl = MultiProcessTest::MakeCmdLine(procname);
|
| - cl.AppendSwitchASCII(switches::kProcessChannelID, startup_channel_id_);
|
| + cl.AppendSwitchASCII(kProcessChannelID, startup_channel_id_);
|
| #if defined(OS_MACOSX)
|
| cl.AppendSwitchASCII(kTestExecutablePath, executable_path_.value());
|
| #endif
|
|
|