AwakableList: For persistent awakables, make Add() call Awake() with reason INITIALIZE.

mojo/edk/system/simple_dispatcher.cc

 // 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.
 
 #include "mojo/edk/system/simple_dispatcher.h"
 
 #include "base/logging.h"
 
 namespace mojo {
 namespace system {
@@ skipping 18 matching lines @@
     Awakable* awakable,
     uint64_t context,
     bool persistent,
     MojoHandleSignals signals,
     HandleSignalsState* signals_state) {
   mutex().AssertHeld();
 
   HandleSignalsState state(GetHandleSignalsStateImplNoLock());
   if (signals_state)
     *signals_state = state;
-  if (state.satisfies(signals)) {
-    if (persistent)
-      awakable_list_.Add(awakable, context, persistent, signals);
-    return MOJO_RESULT_ALREADY_EXISTS;
-  }
-  if (!state.can_satisfy(signals)) {
-    if (persistent)
-      awakable_list_.Add(awakable, context, persistent, signals);
-    return MOJO_RESULT_FAILED_PRECONDITION;
-  }
+  MojoResult rv = MOJO_RESULT_OK;
+  bool should_add = persistent;
+  if (state.satisfies(signals))
+    rv = MOJO_RESULT_ALREADY_EXISTS;
+  else if (!state.can_satisfy(signals))
+    rv = MOJO_RESULT_FAILED_PRECONDITION;
+  else
+    should_add = true;
 
-  awakable_list_.Add(awakable, context, persistent, signals);
-  return MOJO_RESULT_OK;
+  if (should_add)
+    awakable_list_.Add(awakable, context, persistent, signals, state);
+  return rv;
 }
 
 void SimpleDispatcher::RemoveAwakableImplNoLock(
     bool match_context,
     Awakable* awakable,
     uint64_t context,
     HandleSignalsState* signals_state) {
   mutex().AssertHeld();
   awakable_list_.Remove(match_context, awakable, context);
   if (signals_state)
     *signals_state = GetHandleSignalsStateImplNoLock();
 }
 
 }  // namespace system
 }  // namespace mojo