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

TBR=darin@chromium.org

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

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

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',
       ],
     },
     {

mojo/public/c/DEPS

 include_rules = [
+  # Require explicit dependencies in each directory.
   "-mojo/public",
-  "+mojo/public/c",
+  # But everyone can depend on the C system headers.
+  "+mojo/public/c/system",
 ]

mojo/public/c/tests/DEPS → mojo/public/c/system/tests/DEPS

 include_rules = [
   "+testing",
-  # Our test harness is C++, so allow use C++:
+  # Our test harness is C++, so allow the use of C++:
   "+mojo/public/cpp",
   # TODO(vtl): Temporary until these are moved to mojo/public/cpp:
   "+mojo/public/tests",

mojo/public/cpp/DEPS

+include_rules = [
+  # Require explicit dependencies in each directory.
+  "-mojo/public",
+  # But everyone can depend on the C and C++ system headers.
+  "+mojo/public/c/system",
+  "+mojo/public/cpp/system",
+]

mojo/public/cpp/utility/tests/DEPS

+include_rules = [
+  "+testing",
+  # TODO(vtl): Temporary until these are moved to mojo/public/cpp:
+  "+mojo/public/tests",
+]