| Index: mojo/edk/test/BUILD.gn
 | 
| diff --git a/third_party/mojo/src/mojo/edk/test/BUILD.gn b/mojo/edk/test/BUILD.gn
 | 
| similarity index 74%
 | 
| copy from third_party/mojo/src/mojo/edk/test/BUILD.gn
 | 
| copy to mojo/edk/test/BUILD.gn
 | 
| index 834d837ac2ae47e90d34abe27dec5389330da060..00f815180e99049f7d206224f38de9ce4b281ce7 100644
 | 
| --- a/third_party/mojo/src/mojo/edk/test/BUILD.gn
 | 
| +++ b/mojo/edk/test/BUILD.gn
 | 
| @@ -21,12 +21,10 @@ mojo_edk_source_set("test_support") {
 | 
|    deps = [
 | 
|      "//base",
 | 
|      "//base/test:test_support",
 | 
| +    "//mojo/edk/system",
 | 
|      "//testing/gtest",
 | 
| +    "//third_party/mojo/src/mojo/public/cpp/system",
 | 
|    ]
 | 
| -
 | 
| -  mojo_edk_deps = [ "mojo/edk/system" ]
 | 
| -
 | 
| -  mojo_sdk_public_deps = [ "mojo/public/cpp/system" ]
 | 
|  }
 | 
|  
 | 
|  mojo_edk_source_set("run_all_unittests") {
 | 
| @@ -39,12 +37,10 @@ mojo_edk_source_set("run_all_unittests") {
 | 
|      ":test_support_impl",
 | 
|      "//base",
 | 
|      "//base/test:test_support",
 | 
| +    "//mojo/edk/system",
 | 
|      "//testing/gtest",
 | 
| +    "//third_party/mojo/src/mojo/public/c/test_support",
 | 
|    ]
 | 
| -
 | 
| -  mojo_edk_deps = [ "mojo/edk/system" ]
 | 
| -
 | 
| -  mojo_sdk_deps = [ "mojo/public/c/test_support" ]
 | 
|  }
 | 
|  
 | 
|  mojo_edk_source_set("run_all_perftests") {
 | 
| @@ -53,12 +49,10 @@ mojo_edk_source_set("run_all_perftests") {
 | 
|      ":test_support_impl",
 | 
|      "//base",
 | 
|      "//base/test:test_support",
 | 
| +    "//mojo/edk/system",
 | 
| +    "//third_party/mojo/src/mojo/public/c/test_support",
 | 
|    ]
 | 
|  
 | 
| -  mojo_edk_deps = [ "mojo/edk/system" ]
 | 
| -
 | 
| -  mojo_sdk_deps = [ "mojo/public/c/test_support" ]
 | 
| -
 | 
|    sources = [
 | 
|      "run_all_perftests.cc",
 | 
|    ]
 | 
| @@ -69,12 +63,10 @@ mojo_edk_source_set("test_support_impl") {
 | 
|    deps = [
 | 
|      "//base",
 | 
|      "//base/test:test_support",
 | 
| +    "//third_party/mojo/src/mojo/public/c/test_support",
 | 
| +    "//third_party/mojo/src/mojo/public/cpp/system",
 | 
|    ]
 | 
|  
 | 
| -  mojo_sdk_deps = [ "mojo/public/c/test_support" ]
 | 
| -
 | 
| -  mojo_sdk_public_deps = [ "mojo/public/cpp/system" ]
 | 
| -
 | 
|    sources = [
 | 
|      "test_support_impl.cc",
 | 
|      "test_support_impl.h",
 | 
| @@ -89,7 +81,6 @@ mojo_edk_source_set("test_support_impl") {
 | 
|  group("public_tests") {
 | 
|    testonly = true
 | 
|    deps = [
 | 
| -    ":mojo_public_bindings_perftests",
 | 
|      ":mojo_public_bindings_unittests",
 | 
|      ":mojo_public_environment_unittests",
 | 
|      ":mojo_public_system_perftests",
 | 
| @@ -107,7 +98,7 @@ if (mojo_use_application_in_sdk) {
 | 
|    test("mojo_public_application_unittests") {
 | 
|      deps = [
 | 
|        ":run_all_unittests",
 | 
| -      "../../public/cpp/application/tests",
 | 
| +      "../../../third_party/mojo/src/mojo/public/cpp/application/tests",
 | 
|      ]
 | 
|    }
 | 
|  }
 | 
| @@ -115,48 +106,41 @@ if (mojo_use_application_in_sdk) {
 | 
|  test("mojo_public_bindings_unittests") {
 | 
|    deps = [
 | 
|      ":run_all_unittests",
 | 
| -    "../../public/cpp/bindings/tests",
 | 
| -  ]
 | 
| -}
 | 
| -
 | 
| -test("mojo_public_bindings_perftests") {
 | 
| -  deps = [
 | 
| -    ":run_all_perftests",
 | 
| -    "../../public/cpp/bindings/tests:perftests",
 | 
| +    "../../../third_party/mojo/src/mojo/public/cpp/bindings/tests",
 | 
|    ]
 | 
|  }
 | 
|  
 | 
|  test("mojo_public_environment_unittests") {
 | 
|    deps = [
 | 
|      ":run_all_unittests",
 | 
| -    "../../public/cpp/environment/tests",
 | 
| +    "../../../third_party/mojo/src/mojo/public/cpp/environment/tests",
 | 
|    ]
 | 
|  }
 | 
|  
 | 
|  test("mojo_public_system_perftests") {
 | 
|    deps = [
 | 
|      ":run_all_perftests",
 | 
| -    "../../public/c/system/tests:perftests",
 | 
| +    "../../../third_party/mojo/src/mojo/public/c/system/tests:perftests",
 | 
|    ]
 | 
|  }
 | 
|  
 | 
|  test("mojo_public_system_unittests") {
 | 
|    deps = [
 | 
|      ":run_all_unittests",
 | 
| -    "../../public/cpp/system/tests",
 | 
| +    "../../../third_party/mojo/src/mojo/public/cpp/system/tests",
 | 
|    ]
 | 
|  }
 | 
|  
 | 
|  test("mojo_public_utility_unittests") {
 | 
|    deps = [
 | 
|      ":run_all_unittests",
 | 
| -    "../../public/cpp/utility/tests",
 | 
| +    "../../../third_party/mojo/src/mojo/public/cpp/utility/tests",
 | 
|    ]
 | 
|  }
 | 
|  
 | 
|  test("mojo_system_impl_private_unittests") {
 | 
|    deps = [
 | 
|      ":run_all_unittests",
 | 
| -    "../../public/platform/native:system_impl_private_tests",
 | 
| +    "../../../third_party/mojo/src/mojo/public/platform/native:system_impl_private_tests",
 | 
|    ]
 | 
|  }
 | 
| 
 |