Add mojo/c/system/{time.h,wait.h}.

mojo/edk/system/core.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_CORE_H_
 #define MOJO_EDK_SYSTEM_CORE_H_
 
 #include <stdint.h>
 
 #include <functional>
 
 #include "mojo/edk/system/handle_table.h"
 #include "mojo/edk/system/mapping_table.h"
 #include "mojo/edk/system/memory.h"
 #include "mojo/edk/util/mutex.h"
 #include "mojo/edk/util/ref_ptr.h"
 #include "mojo/edk/util/thread_annotations.h"
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/handle.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/public/c/system/result.h"
-#include "mojo/public/c/system/types.h"
+#include "mojo/public/c/system/time.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 
 namespace embedder {
 class PlatformSupport;
 }
 
 namespace system {
 
@@ skipping 42 matching lines @@
   }
 
   // ---------------------------------------------------------------------------
 
   // The following methods are essentially implementations of the Mojo Core
   // functions of the Mojo API, with the C interface translated to C++ by
   // "mojo/edk/embedder/entrypoints.cc". The best way to understand the contract
   // of these methods is to look at the header files defining the corresponding
   // API functions, referenced below.
 
+  // This method corresponds to the API function defined in
+  // "mojo/public/c/system/time.h":
+
+  MojoTimeTicks GetTimeTicksNow();
+
+  // This method corresponds to the API function defined in
+  // "mojo/public/c/system/handle.h":
+  MojoResult Close(MojoHandle handle);
+
   // These methods correspond to the API functions defined in
-  // "mojo/public/c/system/functions.h":
-  MojoTimeTicks GetTimeTicksNow();
-  MojoResult Close(MojoHandle handle);
+  // "mojo/public/c/system/wait.h":
   MojoResult Wait(MojoHandle handle,
                   MojoHandleSignals signals,
                   MojoDeadline deadline,
                   UserPointer<MojoHandleSignalsState> signals_state);
   MojoResult WaitMany(UserPointer<const MojoHandle> handles,
                       UserPointer<const MojoHandleSignals> signals,
                       uint32_t num_handles,
                       MojoDeadline deadline,
                       UserPointer<uint32_t> result_index,
                       UserPointer<MojoHandleSignalsState> signals_states);
@@ skipping 88 matching lines @@
   util::Mutex mapping_table_mutex_;
   MappingTable mapping_table_ MOJO_GUARDED_BY(mapping_table_mutex_);
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(Core);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_CORE_H_