Revert of Remove shell::Loader

services/shell/shell.gyp

 # Copyright 2015 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.
 
 {
   'targets': [{
     'target_name': 'shell_interfaces',
     'type': 'none',
     'variables': {
       'mojom_files': [
@@ skipping 61 matching lines @@
       '../catalog/constants.h',
       '../catalog/entry.cc',
       '../catalog/entry.h',
       '../catalog/reader.cc',
       '../catalog/reader.h',
       '../catalog/resolver.cc',
       '../catalog/resolver.h',
       '../catalog/store.cc',
       '../catalog/store.h',
       '../catalog/types.h',
+      'loader.h',
       'connect_params.cc',
       'connect_params.h',
       'connect_util.cc',
       'connect_util.h',
       'native_runner.h',
       'native_runner_delegate.h',
       'shell.cc',
       'shell.h',
       'switches.cc',
       'switches.cc',
       '<(DEPTH)/mojo/util/filename_util.cc',
       '<(DEPTH)/mojo/util/filename_util.h',
     ],
     'dependencies': [
       'shell_public',
       '<(DEPTH)/base/base.gyp:base',
       '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib',
       '<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
       '<(DEPTH)/net/net.gyp:net',
       '<(DEPTH)/url/url.gyp:url_lib',
     ],
     'export_dependent_settings': [
       'shell_public',
     ],
   }, {
     'target_name': 'mojo_shell_unittests',
     'type': 'executable',
     'sources': [
-      'tests/placeholder_unittest.cc',
+      'tests/loader_unittest.cc',
     ],
     'dependencies': [
       'shell_lib',
       'shell_public',
       'shell_test_public',
       '<(DEPTH)/base/base.gyp:base',
       '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib',
       '<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
       '<(DEPTH)/mojo/mojo_edk.gyp:mojo_run_all_unittests',
       '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
@@ skipping 113 matching lines @@
       'shell_public',
       '<(DEPTH)/base/base.gyp:base',
       '<(DEPTH)/mojo/mojo_edk.gyp:mojo_run_all_unittests',
       '<(DEPTH)/testing/gtest.gyp:gtest',
     ],
     'sources': [
       'public/cpp/tests/interface_registry_unittest.cc',
     ],
   }],
 }