summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorrockot <rockot@chromium.org>2015-08-08 07:30:02 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-08 14:30:34 +0000
commitcba509edaa5efe5a97ead7687c7cbac363d640ff (patch)
treef36005fd9cd1cb42bff279b98fb69ccd2298d081 /ipc
parent0c08d43b87805bb60da81b3615df60771b4d6702 (diff)
downloadchromium_src-cba509edaa5efe5a97ead7687c7cbac363d640ff.zip
chromium_src-cba509edaa5efe5a97ead7687c7cbac363d640ff.tar.gz
chromium_src-cba509edaa5efe5a97ead7687c7cbac363d640ff.tar.bz2
Revert of Re-enable ChannelMojo. (patchset #1 id:40001 of https://codereview.chromium.org/1273283002/ )
Reason for revert: Still seeing flake on ChromeOS, and it's probably this again. Original issue's description: > Re-enable ChannelMojo. > > AGAIN! Previously reverted attempts: > > https://codereview.chromium.org/1262503011/ > https://codereview.chromium.org/1256473002/ > > SyncMessageFilter is set up to properly use thread-safe > Send channels now, so this should stick. > > Maybe. > > BUG=500019 > TBR=jam@chromium.org > > Committed: https://crrev.com/d34d184bd1a88043667b10cba79a5770bd2803fb > Cr-Commit-Position: refs/heads/master@{#342484} TBR= NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=500019 Review URL: https://codereview.chromium.org/1285463002 Cr-Commit-Position: refs/heads/master@{#342526}
Diffstat (limited to 'ipc')
-rw-r--r--ipc/mojo/ipc_channel_mojo.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc
index 9994f8b..08c3458 100644
--- a/ipc/mojo/ipc_channel_mojo.cc
+++ b/ipc/mojo/ipc_channel_mojo.cc
@@ -234,7 +234,9 @@ void ChannelMojo::ChannelInfoDeleter::operator()(
// static
bool ChannelMojo::ShouldBeUsed() {
- return true;
+ // TODO(rockot): Investigate performance bottlenecks and hopefully reenable
+ // this at some point. http://crbug.com/500019
+ return false;
}
// static