Complete SyncMessageFilter initialization after SyncChannel initialization

ipc/ipc_sync_channel.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ipc/ipc_sync_channel.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 447 matching lines @@
 
 void SyncChannel::SetRestrictDispatchChannelGroup(int group) {
   sync_context()->set_restrict_dispatch_group(group);
 }
 
 scoped_refptr<SyncMessageFilter> SyncChannel::CreateSyncMessageFilter() {
   scoped_refptr<SyncMessageFilter> filter = new SyncMessageFilter(
       sync_context()->shutdown_event(),
       sync_context()->IsChannelSendThreadSafe());
   AddFilter(filter.get());
+  if (!did_init())
+    pre_init_sync_message_filters_.push_back(filter);
   return filter;
 }
 
 bool SyncChannel::Send(Message* message) {
 #ifdef IPC_MESSAGE_LOG_ENABLED
   std::string name;
   Logging::GetInstance()->GetMessageText(message->type(), &name, message, NULL);
   TRACE_EVENT1("ipc", "SyncChannel::Send", "name", name);
 #else
   TRACE_EVENT2("ipc", "SyncChannel::Send",
@@ skipping 107 matching lines @@
   // stop or keep watching.  So we always watch it, and create the event as
   // manual reset since the object watcher might otherwise reset the event
   // when we're doing a WaitMany.
   dispatch_watcher_callback_ =
       base::Bind(&SyncChannel::OnWaitableEventSignaled,
                   base::Unretained(this));
   dispatch_watcher_.StartWatching(sync_context()->GetDispatchEvent(),
                                   dispatch_watcher_callback_);
 }
 
+void SyncChannel::OnChannelInit() {
+  for (const auto& filter : pre_init_sync_message_filters_) {
+    filter->set_is_channel_send_thread_safe(
+        context()->IsChannelSendThreadSafe());
+  }
+  pre_init_sync_message_filters_.clear();
+}
+
 }  // namespace IPC