Rationalize mojo_public_*tests targets.

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

 // 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.
 
 // This tests the performance of message pipes via the C API.
 
 #include "mojo/public/c/system/message_pipe.h"
 
 #include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
 
 #include <thread>
 
 #include "mojo/public/c/system/handle.h"
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/c/system/result.h"
 #include "mojo/public/c/system/tests/perftest_utils.h"
 #include "mojo/public/c/system/time.h"
 #include "mojo/public/c/system/wait.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 {
 
 TEST(MessagePipePerftest, CreateAndClose) {
   mojo::test::IterateAndReportPerf("MessagePipe_CreateAndClose", nullptr, []() {
     MojoHandle h0;
     MojoHandle h1;
     MojoResult result = MojoCreateMessagePipe(nullptr, &h0, &h1);
@@ skipping 198 matching lines @@
   DoMessagePipeThreadedTest(1u, 1u, 1000u);
   DoMessagePipeThreadedTest(1u, 1u, 10000u);
 
   DoMessagePipeThreadedTest(3u, 3u, 10u);
   // 100 was done above.
   DoMessagePipeThreadedTest(3u, 3u, 1000u);
   DoMessagePipeThreadedTest(3u, 3u, 10000u);
 }
 
 }  // namespace