chromium/src
0
Fork 0
Code Activity

Remove dependency on testonly target from ppapi/proxy/proxy_channel.

Browse Source 
This CL simply changes the type used for `test_sink_`, since there's no
reason ProxyChannel has to be aware it's anything more specific than a
IPC::Sender.

Bug: 1158995
Change-Id: Ibd8c9c203c89e8c59b7fa865c594df740ee65c0c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3017716
Reviewed-by: Bill Budge <bbudge@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Commit-Queue: Chris Fredrickson <cfredric@chromium.org>
Cr-Commit-Position: refs/heads/master@{#900143}
This commit is contained in:
cfredric
2021-07-09 21:02:18 +00:00
committed by Chromium LUCI CQ
parent 1b345fecd6
commit 455bf8429e
3 changed files with 6 additions and 10 deletions

2
.gn

@ -67,7 +67,7 @@ no_check_targets = [
"//extensions:*", # 28 errors
"//headless:*", # 167 errors
"//ppapi/proxy:ipc_sources", # 13 errors
"//ppapi/proxy:proxy", # 5 errors
"//ppapi/proxy:proxy", # 4 errors
"//ppapi/thunk:*", # 1071 errors
"//remoting/host/security_key:*", # 10 errors
"//remoting/host/win:*", # 43 errors

6
ppapi/proxy/proxy_channel.cc

@ -7,7 +7,7 @@
#include "base/logging.h"
#include "build/build_config.h"
#include "ipc/ipc_platform_file.h"
#include "ipc/ipc_test_sink.h"
#include "ipc/ipc_sender.h"
#if defined(OS_NACL)
#include <unistd.h>
@ -44,9 +44,9 @@ bool ProxyChannel::InitWithChannel(
return true;
}
void ProxyChannel::InitWithTestSink(IPC::TestSink* test_sink) {
void ProxyChannel::InitWithTestSink(IPC::Sender* sender) {
DCHECK(!test_sink_);
test_sink_ = test_sink;
test_sink_ = sender;
#if !defined(OS_NACL)
peer_pid_ = base::GetCurrentProcId();
#endif

8
ppapi/proxy/proxy_channel.h

@ -24,10 +24,6 @@ class SingleThreadTaskRunner;
class WaitableEvent;
}
namespace IPC {
class TestSink;
}
namespace ppapi {
namespace proxy {
@ -77,7 +73,7 @@ class PPAPI_PROXY_EXPORT ProxyChannel
// messages sent via this channel to the given test sink. The test sink
// must outlive this class. In this case, the peer PID will be the current
// process ID.
void InitWithTestSink(IPC::TestSink* test_sink);
void InitWithTestSink(IPC::Sender* sender);
// Shares a file handle (HANDLE / file descriptor) with the remote side. It
// returns a handle that should be sent in exactly one IPC message. Upon
@ -141,7 +137,7 @@ class PPAPI_PROXY_EXPORT ProxyChannel
// When we're unit testing, this will indicate the sink for the messages to
// be deposited so they can be inspected by the test. When non-NULL, this
// indicates that the channel should not be used.
IPC::TestSink* test_sink_;
IPC::Sender* test_sink_;
// Will be null for some tests when there is a test_sink_, and if the
// remote side has crashed.