Mojo: Move mojo/public/{c,cpp}/tests/FOO to mojo/public/{c,cpp}/FOO/tests.

mojo/mojo_public.gypi

Index: mojo/mojo_public.gypi
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 833fd49b7802ded2e03fe2043f43a2b06efc0555..7594971846c426f9711bf9c13731dde977bb8f08 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -192,11 +192,11 @@
         'mojo_system',
       ],
       'sources': [
-        'public/c/tests/system/core_unittest.cc',
-        'public/c/tests/system/core_unittest_pure_c.c',
-        'public/c/tests/system/macros_unittest.cc',
-        'public/cpp/tests/system/core_unittest.cc',
-        'public/cpp/tests/system/macros_unittest.cc',
+        'public/c/system/tests/core_unittest.cc',
+        'public/c/system/tests/core_unittest_pure_c.c',
+        'public/c/system/tests/macros_unittest.cc',
+        'public/cpp/system/tests/core_unittest.cc',
+        'public/cpp/system/tests/macros_unittest.cc',
       ],
     },
     {
@@ -212,16 +212,16 @@
         'mojo_utility',
       ],
       'sources': [
-        'public/cpp/tests/utility/mutex_unittest.cc',
-        'public/cpp/tests/utility/run_loop_unittest.cc',
-        'public/cpp/tests/utility/thread_unittest.cc',
+        'public/cpp/utility/tests/mutex_unittest.cc',
+        'public/cpp/utility/tests/run_loop_unittest.cc',
+        'public/cpp/utility/tests/thread_unittest.cc',
       ],
       'conditions': [
         # See crbug.com/342893:
         ['OS=="win"', {
           'sources!': [
-            'public/cpp/tests/utility/mutex_unittest.cc',
-            'public/cpp/tests/utility/thread_unittest.cc',
+            'public/cpp/utility/tests/mutex_unittest.cc',
+            'public/cpp/utility/tests/thread_unittest.cc',
           ],
         }],
       ],
@@ -238,7 +238,7 @@
         'mojo_utility',
       ],
       'sources': [
-        'public/c/tests/system/core_perftest.cc',
+        'public/c/system/tests/core_perftest.cc',
       ],
     },
     {