Last set of fixes to make the src/mojo/edk pass the page cycler.

mojo/edk/system/dispatcher.h

 // Copyright 2013 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.
 
 #ifndef MOJO_EDK_SYSTEM_DISPATCHER_H_
 #define MOJO_EDK_SYSTEM_DISPATCHER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 252 matching lines @@
                                            MojoHandleSignals signals,
                                            uint32_t context,
                                            HandleSignalsState* signals_state);
   virtual void RemoveAwakableImplNoLock(Awakable* awakable,
                                         HandleSignalsState* signals_state);
 
   // These implement the API used to serialize dispatchers (described below).
   // They will only be called on a dispatcher that's attached to and "owned" by
   // a |MessageInTransit|. See the non-"impl" versions for more information.
   //
-  // Note: |StartSerializeImplNoLock()| is actually called with |lock_| NOT
-  // held, since the dispatcher should only be accessible to the calling thread.
-  // On Debug builds, |EndSerializeAndCloseImplNoLock()| is called with |lock_|
-  // held, to satisfy any |lock_.AssertAcquired()| (e.g., in |CloseImplNoLock()|
-  // -- and anything it calls); disentangling those assertions is
-  // difficult/fragile, and would weaken our general checking of invariants.
-  //
   // TODO(vtl): Consider making these pure virtual once most things support
   // being passed over a message pipe.
   virtual void StartSerializeImplNoLock(size_t* max_size,
                                         size_t* max_platform_handles);
   virtual bool EndSerializeAndCloseImplNoLock(
       void* destination,
       size_t* actual_size,
       PlatformHandleVector* platform_handles);
 
   // These are called before and after a dispatcher is being transported. i.e.
@@ skipping 110 matching lines @@
 // So logging macros and |DCHECK_EQ()|, etc. work.
 MOJO_SYSTEM_IMPL_EXPORT inline std::ostream& operator<<(std::ostream& out,
                                                         Dispatcher::Type type) {
   return out << static_cast<int>(type);
 }
 
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_DISPATCHER_H_