Mojo: Move mojo/system/embedder to mojo/embedder.

mojo/mojo.gyp

 # Copyright 2013 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.
 
 {
   'target_defaults': {
     'conditions': [
       ['mojo_shell_debug_url != ""', {
         'defines': [
           'MOJO_SHELL_DEBUG=1',
@@ skipping 85 matching lines @@
       'type': '<(component)',
       'dependencies': [
         'mojo_system',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
       'defines': [
         'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
       ],
       'sources': [
+        'embedder/embedder.cc',
+        'embedder/embedder.h',
+        'embedder/platform_channel_pair.cc',
+        'embedder/platform_channel_pair.h',
+        'embedder/platform_channel_pair_posix.cc',
+        'embedder/platform_channel_pair_win.cc',
+        'embedder/platform_handle.cc',
+        'embedder/platform_handle.h',
+        'embedder/scoped_platform_handle.h',
         'system/channel.cc',
         'system/channel.h',
         'system/constants.h',
         'system/core_impl.cc',
         'system/core_impl.h',
         'system/data_pipe.cc',
         'system/data_pipe.h',
         'system/data_pipe_consumer_dispatcher.cc',
         'system/data_pipe_consumer_dispatcher.h',
         'system/data_pipe_producer_dispatcher.cc',
         'system/data_pipe_producer_dispatcher.h',
         'system/dispatcher.cc',
         'system/dispatcher.h',
-        'system/embedder/embedder.cc',
-        'system/embedder/embedder.h',
-        'system/embedder/platform_channel_pair.cc',
-        'system/embedder/platform_channel_pair.h',
-        'system/embedder/platform_channel_pair_posix.cc',
-        'system/embedder/platform_channel_pair_win.cc',
-        'system/embedder/platform_handle.cc',
-        'system/embedder/platform_handle.h',
-        'system/embedder/scoped_platform_handle.h',
         'system/local_data_pipe.cc',
         'system/local_data_pipe.h',
         'system/local_message_pipe_endpoint.cc',
         'system/local_message_pipe_endpoint.h',
         'system/memory.cc',
         'system/memory.h',
         'system/message_in_transit.cc',
         'system/message_in_transit.h',
         'system/message_in_transit_queue.cc',
         'system/message_in_transit_queue.h',
@@ skipping 12 matching lines @@
         'system/simple_dispatcher.cc',
         'system/simple_dispatcher.h',
         'system/waiter.cc',
         'system/waiter.h',
         'system/waiter_list.cc',
         'system/waiter_list.h',
         # Test-only code:
         # TODO(vtl): It's a little unfortunate that these end up in the same
         # component as non-test-only code. In the static build, this code should
         # hopefully be dead-stripped.
-        'system/embedder/test_embedder.cc',
-        'system/embedder/test_embedder.h',
+        'embedder/test_embedder.cc',
+        'embedder/test_embedder.h',
       ],
     },
     {
       'target_name': 'mojo_system_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:run_all_unittests',
         '../testing/gtest.gyp:gtest',
         'mojo_common_test_support',
         'mojo_system',
         'mojo_system_impl',
       ],
       'sources': [
+        'embedder/embedder_unittest.cc',
         'system/core_impl_unittest.cc',
         'system/core_test_base.cc',
         'system/core_test_base.h',
         'system/data_pipe_unittest.cc',
         'system/dispatcher_unittest.cc',
-        'system/embedder/embedder_unittest.cc',
         'system/local_data_pipe_unittest.cc',
         'system/message_pipe_dispatcher_unittest.cc',
         'system/message_pipe_unittest.cc',
         'system/multiprocess_message_pipe_unittest.cc',
         'system/raw_channel_unittest.cc',
         'system/remote_message_pipe_unittest.cc',
         'system/simple_dispatcher_unittest.cc',
         'system/test_utils.cc',
         'system/test_utils.h',
         'system/waiter_list_unittest.cc',
@@ skipping 370 matching lines @@
             'java_in_dir': '<(DEPTH)/mojo/shell/android/apk',
             'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res',
             'native_lib_target': 'libmojo_shell',
           },
           'includes': [ '../build/java_apk.gypi' ],
         }
       ],
     }],
   ],
 }