Move mojo/public/c/environment/tests to mojo/public/c/tests/environment.

R=jamesr@chromium.org

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

Cr-Mirrored-From: https://github.com/domokit/mojo
Cr-Mirrored-Commit: 03a3949b7da7f0f56ab05a2aed4bfe147a072cfe
diff --git a/c/BUILD.gn b/c/BUILD.gn
index 94fc1b6..4616fd7 100644
--- a/c/BUILD.gn
+++ b/c/BUILD.gn
@@ -138,6 +138,21 @@
   ]
 }
 
+mojo_sdk_source_set("environment_perftest_helpers") {
+  testonly = true
+
+  sources = [
+    "tests/environment/async_waiter_perftest_helpers.cc",
+    "tests/environment/async_waiter_perftest_helpers.h",
+  ]
+
+  public_deps = [
+    ":environment",
+  ]
+
+  mojo_sdk_deps = [ "mojo/public/cpp/system" ]
+}
+
 # system -----------------------------------------------------------------------
 
 # Headers in include/mojo/system (to be included as <mojo/system/HEADER.h>).
diff --git a/c/environment/tests/BUILD.gn b/c/environment/tests/BUILD.gn
deleted file mode 100644
index 51a31c3..0000000
--- a/c/environment/tests/BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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.
-
-import("../../../mojo_sdk.gni")
-
-mojo_sdk_source_set("perftest_helpers") {
-  testonly = true
-
-  sources = [
-    "async_waiter_perftest_helpers.cc",
-    "async_waiter_perftest_helpers.h",
-  ]
-
-  mojo_sdk_deps = [
-    "mojo/public/c:environment",
-    "mojo/public/c:system",
-    "mojo/public/cpp/system",
-  ]
-}
diff --git a/c/environment/tests/async_waiter_perftest_helpers.cc b/c/tests/environment/async_waiter_perftest_helpers.cc
similarity index 97%
rename from c/environment/tests/async_waiter_perftest_helpers.cc
rename to c/tests/environment/async_waiter_perftest_helpers.cc
index 2af95be..f5f2433 100644
--- a/c/environment/tests/async_waiter_perftest_helpers.cc
+++ b/c/tests/environment/async_waiter_perftest_helpers.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/public/c/environment/tests/async_waiter_perftest_helpers.h"
+#include "mojo/public/c/tests/environment/async_waiter_perftest_helpers.h"
 
 #include <assert.h>
 #include <mojo/system/handle.h>
diff --git a/c/environment/tests/async_waiter_perftest_helpers.h b/c/tests/environment/async_waiter_perftest_helpers.h
similarity index 85%
rename from c/environment/tests/async_waiter_perftest_helpers.h
rename to c/tests/environment/async_waiter_perftest_helpers.h
index 0a3c3e6..e49faeb 100644
--- a/c/environment/tests/async_waiter_perftest_helpers.h
+++ b/c/tests/environment/async_waiter_perftest_helpers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_PUBLIC_C_ENVIRONMENT_TESTS_ASYNC_WAITER_PERFTEST_HELPERS_H_
-#define MOJO_PUBLIC_C_ENVIRONMENT_TESTS_ASYNC_WAITER_PERFTEST_HELPERS_H_
+#ifndef MOJO_PUBLIC_C_TESTS_ENVIRONMENT_ASYNC_WAITER_PERFTEST_HELPERS_H_
+#define MOJO_PUBLIC_C_TESTS_ENVIRONMENT_ASYNC_WAITER_PERFTEST_HELPERS_H_
 
 #include <mojo/environment/async_waiter.h>
 #include <stdint.h>
@@ -28,4 +28,4 @@
 }  // namespace test
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_C_ENVIRONMENT_TESTS_ASYNC_WAITER_PERFTEST_HELPERS_H_
+#endif  // MOJO_PUBLIC_C_TESTS_ENVIRONMENT_ASYNC_WAITER_PERFTEST_HELPERS_H_
diff --git a/cpp/environment/tests/BUILD.gn b/cpp/environment/tests/BUILD.gn
index e8b12ad..2ad2bfd 100644
--- a/cpp/environment/tests/BUILD.gn
+++ b/cpp/environment/tests/BUILD.gn
@@ -40,7 +40,7 @@
   ]
 
   mojo_sdk_deps = [
-    "mojo/public/c/environment/tests:perftest_helpers",
+    "mojo/public/c:environment_perftest_helpers",
     "mojo/public/cpp/environment:standalone",
     "mojo/public/cpp/system",
     "mojo/public/cpp/test_support",
diff --git a/cpp/environment/tests/run_loop_async_wait_perftest.cc b/cpp/environment/tests/run_loop_async_wait_perftest.cc
index c93cc76..8a8dd73 100644
--- a/cpp/environment/tests/run_loop_async_wait_perftest.cc
+++ b/cpp/environment/tests/run_loop_async_wait_perftest.cc
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 
-#include "mojo/public/c/environment/tests/async_waiter_perftest_helpers.h"
+#include "mojo/public/c/tests/environment/async_waiter_perftest_helpers.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/test_support/test_support.h"
 #include "mojo/public/cpp/utility/run_loop.h"