Rationalize mojo_public_*tests targets.

mojo/public/c/system/tests/wait_set_perftest.cc

 // Copyright 2016 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.
 
 // This tests the performance of wait sets via the C API.
 
 #include "mojo/public/c/system/wait_set.h"
 
 #include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
 
 #include <atomic>
 #include <thread>
 #include <vector>
 
 #include "mojo/public/c/system/handle.h"
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/public/c/system/result.h"
 #include "mojo/public/c/system/tests/perftest_utils.h"
-#include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/cpp/test_support/test_support.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Creates a wait set, creates a bunch of message pipes, and populates the wait
 // set with entries. There will be |num_entries| entries; the |i|-th entry will
 // be given cookie |i| and will be watching for readability on the message pipe
 // endpoint |h0s->at(i)| whose corresponding endpoint is |h1s->at(i)|.
 void CreateAndPopulateWaitSet(unsigned num_entries,
@@ skipping 138 matching lines @@
 }
 
 TEST(WaitSetPerftest, ThreadedWait) {
   DoWaitSetThreadedWaitTest(10u);
   DoWaitSetThreadedWaitTest(100u);
   DoWaitSetThreadedWaitTest(1000u);
   DoWaitSetThreadedWaitTest(10000u);
 }
 
 }  // namespace