Mojo: Minor core.h reorganization.

Move time ticks stuff to be first. I'm trying to keep things in order
starting from simplest/most essential.

R=sky@chromium.org

Review URL: https://codereview.chromium.org/101513005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240223 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 26 insertions, 26 deletions

diff --git a/mojo/public/system/core.h b/mojo/public/system/core.h
index 2461e48..e4a61ed 100644
--- a/mojo/public/system/core.h
+++ b/mojo/public/system/core.h
@@ -17,6 +17,9 @@
 // TODO(vtl): Notes: Use of undefined flags will lead to undefined behavior
 // (typically they'll be ignored), not necessarily an error.
 
+// Used to specify time ticks. Value is in microseconds.
+typedef int64_t MojoTimeTicks;
+
 // Handles to Mojo objects.
 typedef uint32_t MojoHandle;
 
@@ -38,9 +41,6 @@ typedef uint32_t MojoWriteMessageFlags;
 // Used to specify different modes to |MojoReadMessage()|.
 typedef uint32_t MojoReadMessageFlags;
 
-// Used to specify time ticks. Value is in microseconds.
-typedef int64_t MojoTimeTicks;
-
 // Constants -------------------------------------------------------------------
 
 // |MojoHandle|:
@@ -192,6 +192,11 @@ const MojoReadMessageFlags MOJO_READ_MESSAGE_FLAG_MAY_DISCARD = 1 << 0;
 extern "C" {
 #endif
 
+// Platform-dependent monotonically increasing tick count representing "right
+// now." The resolution of this clock is ~1-15ms.  Resolution varies depending
+// on hardware/operating system configuration.
+MOJO_SYSTEM_EXPORT MojoTimeTicks MojoGetTimeTicksNow();
+
 // Closes the given |handle|.
 //
 // Returns:
@@ -259,11 +264,6 @@ MOJO_SYSTEM_EXPORT MojoResult MojoReadMessage(MojoHandle handle,
                                               uint32_t* num_handles,
                                               MojoReadMessageFlags flags);
 
-// Platform-dependent monotonically increasing tick count representing "right
-// now." The resolution of this clock is ~1-15ms.  Resolution varies depending
-// on hardware/operating system configuration.
-MOJO_SYSTEM_EXPORT MojoTimeTicks MojoGetTimeTicksNow();
-
 #ifdef __cplusplus
 }  // extern "C"
 #endif
diff --git a/mojo/public/system/core_private.cc b/mojo/public/system/core_private.cc
index 3854c65..1ef8624 100644
--- a/mojo/public/system/core_private.cc
+++ b/mojo/public/system/core_private.cc
@@ -11,6 +11,11 @@ static mojo::CorePrivate* g_core = NULL;
 
 extern "C" {
 
+MojoTimeTicks MojoGetTimeTicksNow() {
+  assert(g_core);
+  return g_core->GetTimeTicksNow();
+}
+
 MojoResult MojoClose(MojoHandle handle) {
   assert(g_core);
   return g_core->Close(handle);
@@ -58,11 +63,6 @@ MojoResult MojoReadMessage(MojoHandle handle,
                              flags);
 }
 
-MojoTimeTicks MojoGetTimeTicksNow() {
-  assert(g_core);
-  return g_core->GetTimeTicksNow();
-}
-
 }  // extern "C"
 
 namespace mojo {
diff --git a/mojo/public/system/core_private.h b/mojo/public/system/core_private.h
index d72addd..8f18023 100644
--- a/mojo/public/system/core_private.h
+++ b/mojo/public/system/core_private.h
@@ -18,6 +18,7 @@ class MOJO_SYSTEM_EXPORT CorePrivate {
 
   static void Init(CorePrivate* core);
 
+  virtual MojoTimeTicks GetTimeTicksNow() = 0;
   virtual MojoResult Close(MojoHandle handle) = 0;
   virtual MojoResult Wait(MojoHandle handle,
                           MojoWaitFlags flags,
@@ -40,7 +41,6 @@ class MOJO_SYSTEM_EXPORT CorePrivate {
                                  MojoHandle* handles,
                                  uint32_t* num_handles,
                                  MojoReadMessageFlags flags) = 0;
-  virtual MojoTimeTicks GetTimeTicksNow() = 0;
 };
 
 }  // namespace mojo
diff --git a/mojo/public/tests/system_core_cpp_unittest.cc b/mojo/public/tests/system_core_cpp_unittest.cc
index 1f56264..a910c6e 100644
--- a/mojo/public/tests/system_core_cpp_unittest.cc
+++ b/mojo/public/tests/system_core_cpp_unittest.cc
@@ -12,6 +12,12 @@
 namespace mojo {
 namespace {
 
+TEST(CoreCppTest, GetTimeTicksNow) {
+  const MojoTimeTicks start = GetTimeTicksNow();
+  EXPECT_NE(static_cast<MojoTimeTicks>(0), start)
+      << "GetTimeTicksNow should return nonzero value";
+}
+
 TEST(CoreCppTest, Basic) {
   // Basic |Handle| implementation:
   {
@@ -368,11 +374,5 @@ TEST(CoreCppTest, TearDownWithMessagesEnqueued) {
   }
 }
 
-TEST(CoreCppTest, GetTimeTicksNow) {
-  const MojoTimeTicks start = GetTimeTicksNow();
-  EXPECT_NE(static_cast<MojoTimeTicks>(0), start)
-      << "TimeTicks should return non-zero value";
-}
-
 }  // namespace
 }  // namespace mojo
diff --git a/mojo/public/tests/system_core_unittest.cc b/mojo/public/tests/system_core_unittest.cc
index e3f3b0f..26cadee 100644
--- a/mojo/public/tests/system_core_unittest.cc
+++ b/mojo/public/tests/system_core_unittest.cc
@@ -13,6 +13,12 @@
 namespace mojo {
 namespace {
 
+TEST(SystemTest, GetTimeTicksNow) {
+  const MojoTimeTicks start = MojoGetTimeTicksNow();
+  EXPECT_NE(static_cast<MojoTimeTicks>(0), start)
+      << "MojoGetTimeTicksNow should return nonzero value";
+}
+
 TEST(SystemTest, Basic) {
   MojoHandle h_0;
   MojoWaitFlags wf;
@@ -99,12 +105,6 @@ TEST(SystemTest, Basic) {
   EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h_1));
 }
 
-TEST(SystemTest, GetTimeTicksNow) {
-  const MojoTimeTicks start = MojoGetTimeTicksNow();
-  EXPECT_NE(static_cast<MojoTimeTicks>(0), start)
-      << "TimeTicks should return non-zero value";
-}
-
 // TODO(vtl): Add multi-threaded tests.
 
 }  // namespace