Stop linking in the old Mojo EDK.

mojo/edk/system/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")
 import("../../../mojo/public/tools/bindings/mojom.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 config("system_config") {
   defines = [
     # Ensures that dependent projects import the core functions on Windows.
     "MOJO_USE_SYSTEM_IMPL",
   ]
 }
 
-static_library("system") {
-  # TODO(use_chrome_edk): this should be a component to match third_party,
-  # but since third_party includes it, we either make it a static library
-  # or we have to change the export macros to be different than third_party.
-  #component("system") {
-  # TODO(use_chrome_edk): remove "2"
-  output_name = "mojo_system_impl2"
+component("system") {
+  output_name = "mojo_system_impl"
 
   sources = [
     "async_waiter.cc",
     "async_waiter.h",
     "awakable.h",
     "awakable_list.cc",
     "awakable_list.h",
     "broker.h",
     "broker_messages.h",
     "broker_state.cc",
@@ skipping 70 matching lines @@
     cflags = [ "/wd4324" ]  # Structure was padded due to __declspec(align()),
                             # which is uninteresting.
   }
 
   allow_circular_includes_from = [ "../embedder" ]
 }
 
 group("tests") {
   testonly = true
   deps = [
-    # TODO(use_chrome_edk): remove "2"
-    ":mojo_message_pipe_perftests2",
-    ":mojo_system_unittests2",
+    ":mojo_message_pipe_perftests",
+    ":mojo_system_unittests",
   ]
 }
 
 source_set("test_utils") {
   testonly = true
 
   sources = [
     "test_utils.cc",
     "test_utils.h",
   ]
 
   public_deps = [
     "//mojo/public/c/system",
     "//mojo/public/cpp/system",
   ]
 
   deps = [
     "//base",
     "//base/test:test_support",
     "//mojo/edk/test:test_support",
     "//testing/gtest:gtest",
   ]
 }
 
-# TODO(use_chrome_edk): remove "2"
-test("mojo_system_unittests2") {
+test("mojo_system_unittests") {
   sources = [
     "../test/multiprocess_test_helper_unittest.cc",
     "awakable_list_unittest.cc",
     "core_test_base.cc",
     "core_test_base.h",
     "core_unittest.cc",
     "data_pipe_unittest.cc",
     "dispatcher_unittest.cc",
     "message_in_transit_queue_unittest.cc",
     "message_in_transit_test_utils.cc",
     "message_in_transit_test_utils.h",
     "message_pipe_test_utils.cc",
     "message_pipe_test_utils.h",
     "message_pipe_unittest.cc",
     "multiprocess_message_pipe_unittest.cc",
     "options_validation_unittest.cc",
     "platform_handle_dispatcher_unittest.cc",
     "raw_channel_unittest.cc",
     "shared_buffer_dispatcher_unittest.cc",
     "simple_dispatcher_unittest.cc",
     "wait_set_dispatcher_unittest.cc",
     "waiter_test_utils.cc",
     "waiter_test_utils.h",
     "waiter_unittest.cc",
   ]
 
   deps = [
     ":test_utils",
-
-    # TODO(use_chrome_edk): remove "2"
     "../../../mojo/public/cpp/environment:standalone",
-    "../embedder:embedder_unittests2",
+    "../embedder:embedder_unittests",
     "../test:test_support",
     "//base",
     "//base/test:test_support",
+    "//mojo/edk/system",
     "//mojo/edk/test:run_all_unittests",
     "//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",
   ]
 
-  # TODO(use_chrome_edk): remove "2"
-  allow_circular_includes_from = [ "../embedder:embedder_unittests2" ]
+  allow_circular_includes_from = [ "../embedder:embedder_unittests" ]
 }
 
-# TODO(use_chrome_edk): remove "2"
-test("mojo_message_pipe_perftests2") {
+test("mojo_message_pipe_perftests") {
   sources = [
     "message_pipe_perftest.cc",
     "message_pipe_test_utils.cc",
     "message_pipe_test_utils.h",
   ]
 
   deps = [
     ":test_utils",
     "../../../mojo/public/cpp/environment:standalone",
     "../test:run_all_perftests",
     "../test:test_support",
     "//base",
     "//base/test:test_support",
+    "//mojo/edk/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",
   ]
 }