diff options
| author | rockot <rockot@chromium.org> | 2016-03-16 10:50:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-16 17:53:22 +0000 |
| commit | b0abbd20ecfc1b84f7570ee7f5df100f043010e8 (patch) | |
| tree | 852cb1603e48bb647af136269089ee5ba5dda8c5 /ipc/mojo | |
| parent | 82f18cd2a7b718c4d5356222017d9855a53eb6f3 (diff) | |
| download | chromium_src-b0abbd20ecfc1b84f7570ee7f5df100f043010e8.zip chromium_src-b0abbd20ecfc1b84f7570ee7f5df100f043010e8.tar.gz chromium_src-b0abbd20ecfc1b84f7570ee7f5df100f043010e8.tar.bz2 | |
Add support for MojoChannel field trial
This adds support for the upcoming MojoChannel field trial.
It also simplifies the logic around enabling Mojo channel
in general, getting rid of compile-time overrides and instead
controlling the feature only at runtime via a single flag or
(in the absence of said flag) the field trial.
BUG=595082
R=jam@chromium.org
Review URL: https://codereview.chromium.org/1805653003
Cr-Commit-Position: refs/heads/master@{#381490}
Diffstat (limited to 'ipc/mojo')
| -rw-r--r-- | ipc/mojo/ipc_channel_mojo.cc | 7 | ||||
| -rw-r--r-- | ipc/mojo/ipc_channel_mojo.h | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc index 8832d8d..a0dabad 100644 --- a/ipc/mojo/ipc_channel_mojo.cc +++ b/ipc/mojo/ipc_channel_mojo.cc @@ -199,13 +199,6 @@ MojoResult UnwrapAttachment(mojom::SerializedHandlePtr handle, //------------------------------------------------------------------------------ // static -bool ChannelMojo::ShouldBeUsed() { - // TODO(rockot): Investigate performance bottlenecks and hopefully reenable - // this at some point. http://crbug.com/500019 - return false; -} - -// static scoped_ptr<ChannelMojo> ChannelMojo::Create( mojo::ScopedMessagePipeHandle handle, Mode mode, diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h index c1b659a..8c5de24 100644 --- a/ipc/mojo/ipc_channel_mojo.h +++ b/ipc/mojo/ipc_channel_mojo.h @@ -38,9 +38,6 @@ class IPC_MOJO_EXPORT ChannelMojo public MojoBootstrap::Delegate, public NON_EXPORTED_BASE(internal::MessagePipeReader::Delegate) { public: - // True if ChannelMojo should be used regardless of the flag. - static bool ShouldBeUsed(); - // Creates a ChannelMojo. static scoped_ptr<ChannelMojo> Create(mojo::ScopedMessagePipeHandle handle, Mode mode, |