Stop linking in the old Mojo EDK.

mojo/edk/test/BUILD.gn

 # Copyright 2014 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("//testing/test.gni")
 
 source_set("test_support") {
   testonly = true
   sources = [
     "multiprocess_test_helper.cc",
     "multiprocess_test_helper.h",
     "scoped_ipc_support.cc",
     "scoped_ipc_support.h",
     "test_utils.h",
     "test_utils_posix.cc",
     "test_utils_win.cc",
   ]
 
   deps = [
     "//base",
     "//base/test:test_support",
+    "//mojo/edk/system",
     "//mojo/public/cpp/system",
     "//testing/gtest",
-
-    # TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are
-    # declared in third party only for now.
-    "//third_party/mojo/src/mojo/edk/system",
   ]
 }
 
 source_set("run_all_unittests") {
   testonly = true
   sources = [
     "run_all_unittests.cc",
   ]
 
   deps = [
     ":test_support",
     ":test_support_impl",
     "//base",
     "//base/test:test_support",
+    "//mojo/edk/system",
     "//mojo/public/c/test_support",
     "//testing/gtest",
+  ]
 
-    # TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are
-    # declared in third party only for now.
-    "//third_party/mojo/src/mojo/edk/system",
-  ]
+  if (is_linux && !is_component_build) {
+    # This tests dynamically loads libmojo_test_support even in non-component
+    # builds.
+    public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
+  }
 }
 
 source_set("run_all_perftests") {
   testonly = true
   deps = [
     ":test_support_impl",
     "//base",
     "//base/test:test_support",
+    "//mojo/edk/system",
     "//mojo/edk/test:test_support",
     "//mojo/public/c/test_support",
-
-    # TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are
-    # declared in third party only for now.
-    "//third_party/mojo/src/mojo/edk/system",
+    "//testing/gtest",
   ]
 
   sources = [
     "run_all_perftests.cc",
   ]
+
+  if (is_linux && !is_component_build) {
+    # This tests dynamically loads libmojo_test_support even in non-component
+    # builds.
+    public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
+  }
 }
 
 source_set("test_support_impl") {
   testonly = true
   deps = [
     "//base",
     "//base/test:test_support",
     "//mojo/public/c/test_support",
     "//mojo/public/cpp/system",
   ]
 
   sources = [
     "test_support_impl.cc",
     "test_support_impl.h",
   ]
 }
 
 # Public SDK test targets follow. These targets are not defined within the
 # public SDK itself as running the unittests requires the EDK.
 # TODO(vtl): These don't really belong here. (They should be converted to
 # apptests, but even apart from that these targets belong somewhere else.)
 
 group("public_tests") {
   testonly = true
   deps = [
-    # TODO(use_chrome_edk): remove "2"
-    ":mojo_public_bindings_unittests2",
-    ":mojo_public_environment_unittests2",
-    ":mojo_public_system_perftests2",
-    ":mojo_public_system_unittests2",
-    ":mojo_public_utility_unittests2",
+    ":mojo_public_bindings_unittests",
+    ":mojo_public_environment_unittests",
+    ":mojo_public_system_perftests",
+    ":mojo_public_system_unittests",
+    ":mojo_public_utility_unittests",
   ]
 }
 
-# TODO(use_chrome_edk): remove "2"
-test("mojo_public_bindings_unittests2") {
+test("mojo_public_bindings_unittests") {
   deps = [
     ":run_all_unittests",
     "//mojo/public/cpp/bindings/tests",
   ]
 }
 
-# TODO(use_chrome_edk): remove "2"
-test("mojo_public_environment_unittests2") {
+test("mojo_public_environment_unittests") {
   deps = [
     ":run_all_unittests",
     "//mojo/public/cpp/environment/tests",
   ]
 }
 
-# TODO(use_chrome_edk): remove "2"
-test("mojo_public_system_perftests2") {
+test("mojo_public_system_perftests") {
   deps = [
     ":run_all_perftests",
     "//mojo/public/c/system/tests:perftests",
   ]
 }
 
-# TODO(use_chrome_edk): remove "2"
-test("mojo_public_system_unittests2") {
+test("mojo_public_system_unittests") {
   deps = [
     ":run_all_unittests",
     "//mojo/public/cpp/system/tests",
   ]
 }
 
-# TODO(use_chrome_edk): remove "2"
-test("mojo_public_utility_unittests2") {
+test("mojo_public_utility_unittests") {
   deps = [
     ":run_all_unittests",
     "//mojo/public/cpp/utility/tests",
   ]
 }