Move remaining test targets out of //mojo/public.

mojo/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("//build/config/ui.gni")
 import("//mojo/public/mojo.gni")
 
 # TODO(beng): this meta target should probably move to the root dir's BUILD.gn.
 group("mojo") {
   # Meta-target, don't link into production code.
@@ skipping 32 matching lines @@
     "//mojo/common:mojo_common_unittests",
     "//mojo/converters/surfaces/tests:mojo_surfaces_lib_unittests",
     "//mojo/edk/js/test:js_unittests",
     "//mojo/edk/js/test:js_integration_tests",
     "//mojo/edk/system:mojo_message_pipe_perftests",
     "//mojo/edk/system:mojo_system_unittests",
     "//mojo/edk/test:mojo_public_application_unittests",
     "//mojo/edk/test:mojo_public_bindings_unittests",
     "//mojo/edk/test:mojo_public_environment_unittests",
     "//mojo/edk/test:mojo_public_system_perftests",
-    "//mojo/public/cpp/system/tests:mojo_public_system_unittests",
-    "//mojo/public/cpp/utility/tests:mojo_public_utility_unittests",
+    "//mojo/edk/test:mojo_public_system_unittests",
+    "//mojo/edk/test:mojo_public_utility_unittests",
     "//mojo/services/network:apptests",
     "//mojo/tools:message_generator",
     "//services/clipboard:apptests",
     "//services/js:js_services_unittests",
     "//services/js:js_apptests",
   ]
 
   if (is_android) {
     deps += [ "//mojo/edk/system:mojo_system_unittests_apk" ]
   }
 
   if (use_aura) {
     deps += [
       "//mojo/services/view_manager/public/cpp/tests:mojo_view_manager_lib_unittests",
       "//services/window_manager:window_manager_unittests",
       "//services/view_manager:view_manager_service_apptests",
       "//services/view_manager:view_manager_service_unittests",
     ]
   }
 
   if (mojo_use_dart) {
     deps += [ "//mojo/dart/embedder/test:dart_unittests" ]
   }
 }