[Chromoting] The desktop process now creates a pre-connected pipe and passes (with some help of the…

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 7338b55680bde37dd1f77c57d162ded02c64dcdf..ace7d00af6a98ccf08e1a39c821b95b2c705cad1 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -597,6 +597,7 @@
             '../base/base.gyp:base',
             'remoting_breakpad',
             'remoting_elevated_controller',
+            'remoting_host',
             'remoting_host_logging',
             'remoting_protocol',
             'remoting_version_resources',
@@ -605,8 +606,6 @@
             '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_controller_version.rc',
             'host/pin_hash.cc',
             'host/pin_hash.h',
-            'host/usage_stats_consent.h',
-            'host/usage_stats_consent_win.cc',
             'host/verify_config_window_win.cc',
             'host/verify_config_window_win.h',
             'host/win/elevated_controller.cc',
@@ -647,6 +646,7 @@
             '../net/net.gyp:net',
             'remoting_base',
             'remoting_breakpad',
+            'remoting_host',
             'remoting_host_logging',
             'remoting_version_resources',
           ],
@@ -667,14 +667,10 @@
             'host/host_exit_codes.h',
             'host/ipc_consts.cc',
             'host/ipc_consts.h',
-            'host/usage_stats_consent.h',
-            'host/usage_stats_consent_win.cc',
             'host/win/host_service.cc',
             'host/win/host_service.h',
             'host/win/host_service.rc',
             'host/win/host_service_resource.h',
-            'host/win/launch_process_with_token.cc',
-            'host/win/launch_process_with_token.h',
             'host/win/omaha.cc',
             'host/win/omaha.h',
             'host/win/unprivileged_process_delegate.cc',
@@ -912,59 +908,6 @@
       ],  # end of 'targets'
     }],  # '<(wix_path) != ""'
 
-    ['remoting_multi_process != 0', {
-      'targets': [
-        {
-          'target_name': 'remoting_desktop',
-          'type': 'executable',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            'remoting_base',
-            'remoting_breakpad',
-            'remoting_host',
-            'remoting_host_logging',
-            'remoting_version_resources',
-            '../base/base.gyp:base',
-            '../ipc/ipc.gyp:ipc',
-          ],
-          'sources': [
-            'host/desktop_process.cc',
-            'host/desktop_process.h',
-            'host/host_ui.rc',
-            'host/usage_stats_consent.h',
-            'host/usage_stats_consent_win.cc',
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_desktop_version.rc',
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lcomctl32.lib',
-            ],
-          },
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'AdditionalOptions': [
-                "\"/manifestdependency:type='win32' "
-                    "name='Microsoft.Windows.Common-Controls' "
-                    "version='6.0.0.0' "
-                    "processorArchitecture='*' "
-                    "publicKeyToken='6595b64144ccf1df' language='*'\"",
-              ],
-              'conditions': [
-                ['buildtype == "Official" and remoting_multi_process != 0', {
-                  'AdditionalOptions': [
-                    "\"/MANIFESTUAC:level='requireAdministrator' "
-                        "uiAccess='true'\"",
-                  ],
-                }],
-              ],
-              # 2 == /SUBSYSTEM:WINDOWS
-              'SubSystem': '2',
-            },
-          },
-        },  # end of target 'remoting_desktop'
-      ],
-    }],  # 'remoting_multi_process != 0'
-
   ],  # end of 'conditions'
 
   'targets': [
@@ -1035,6 +978,69 @@
     },  # end of target 'remoting_client_plugin'
 
     {
+      'target_name': 'remoting_desktop',

[Sergey Ulanov, 2012/10/24 20:12:01]

Do we need to compile this to a separate binary for desktop process? I think we
should use to apply the same approach that chrome uses: one single binary is
shared between all chrome processes. This will allow to reduce downloadable
package size and also reduce memory consumption by the daemons.

[alexeypa (please no reviews), 2012/10/24 21:41:51]

Yes. It should have "level='requireAdministrator'" in the binary's manifest
which means that the binary cannot be launched using CreateProcess.
I agree that having a single binary is preferred to multiple different binaries.
Right now however I cannot really merge them. Once refactoring is done, I will
be able to merge daemon and host/network binaries. The desktop one will have to
be separate.

Another thing that we can do is to have a couple of launchers and a single DLL
loaded by the launchers. We still need two launchers because of the manifest
issue above.

[Sergey Ulanov, 2012/10/24 23:46:28]

Ok, maybe add TODO somewhere for now?
I see. Is it possible to have one small shim binary with that attribute in the
manifest that would just launch the main binary that doesn't have that
attribute?

[alexeypa (please no reviews), 2012/10/24 23:58:20]

http://crbug.com/157727
Maybe. I'm not sure how SendSAS() function checks the manifest. This will also
make us to spawn three processes in order to launch the desktop process in a
session.

+      'type': 'executable',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'defines': [
+        'REMOTING_MULTI_PROCESS',
+      ],
+      'dependencies': [
+        'remoting_base',
+        'remoting_breakpad',
+        'remoting_host',
+        'remoting_host_logging',
+        '../base/base.gyp:base',
+        '../ipc/ipc.gyp:ipc',
+      ],
+      'sources': [
+        'host/desktop_process.cc',
+        'host/desktop_process.h',
+        'host/desktop_process_main.cc',
+        'host/desktop_session_agent.cc',
+        'host/desktop_session_agent.h',
+        'host/desktop_session_agent_posix.cc',
+        'host/desktop_session_agent_win.cc',
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': [
+            'remoting_version_resources',
+          ],
+          'sources': [
+            'host/host_ui.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_desktop_version.rc',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lcomctl32.lib',
+            ],
+          },
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'AdditionalOptions': [
+                "\"/manifestdependency:type='win32' "
+                    "name='Microsoft.Windows.Common-Controls' "
+                    "version='6.0.0.0' "
+                    "processorArchitecture='*' "
+                    "publicKeyToken='6595b64144ccf1df' language='*'\"",
+              ],
+              'conditions': [
+                ['buildtype == "Official"', {
+                  'AdditionalOptions': [
+                    "\"/MANIFESTUAC:level='requireAdministrator' "
+                        "uiAccess='true'\"",
+                  ],
+                }],
+              ],
+              # 2 == /SUBSYSTEM:WINDOWS
+              'SubSystem': '2',
+            },
+          },
+        }],
+      ],
+    },  # end of target 'remoting_desktop'
+
+    {
       'target_name': 'remoting_host_event_logger',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ -1494,6 +1500,7 @@
         'host/desktop_resizer_linux.cc',
         'host/desktop_resizer_win.cc',
         'host/desktop_resizer_mac.cc',
+        'host/desktop_session_connector.h',
         'host/differ.cc',
         'host/differ.h',
         'host/disconnect_window.h',
@@ -1531,6 +1538,10 @@
         'host/in_memory_host_config.h',
         'host/ipc_consts.cc',
         'host/ipc_consts.h',
+        'host/ipc_desktop_environment_factory.cc',
+        'host/ipc_desktop_environment_factory.h',
+        'host/ipc_desktop_environment.cc',
+        'host/ipc_desktop_environment.h',
         'host/it2me_host_user_interface.cc',
         'host/it2me_host_user_interface.h',
         'host/json_host_config.cc',
@@ -1586,6 +1597,8 @@
         'host/ui_strings.h',
         'host/url_request_context.cc',
         'host/url_request_context.h',
+        'host/usage_stats_consent.h',
+        'host/usage_stats_consent_win.cc',
         'host/user_authenticator.h',
         'host/user_authenticator_linux.cc',
         'host/user_authenticator_mac.cc',
@@ -1602,6 +1615,8 @@
         'host/vlog_net_log.h',
         'host/win/desktop.cc',
         'host/win/desktop.h',
+        'host/win/launch_process_with_token.cc',
+        'host/win/launch_process_with_token.h',
         'host/win/omaha.cc',
         'host/win/omaha.h',
         'host/win/scoped_thread_desktop.cc',
@@ -1758,8 +1773,6 @@
         'host/posix/signal_handler.cc',
         'host/posix/signal_handler.h',
         'host/remoting_me2me_host.cc',
-        'host/usage_stats_consent.h',
-        'host/usage_stats_consent_win.cc',
       ],
       'conditions': [
         ['os_posix != 1', {
@@ -1794,12 +1807,7 @@
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_host_me2me_version.rc',
-            'host/desktop_session_connector.h',
             'host/host_ui.rc',
-            'host/ipc_desktop_environment_factory.cc',
-            'host/ipc_desktop_environment_factory.h',
-            'host/ipc_desktop_environment.cc',
-            'host/ipc_desktop_environment.h',
           ],
           'link_settings': {
             'libraries': [
@@ -2080,8 +2088,15 @@
         'host/daemon_process.cc',
         'host/daemon_process.h',
         'host/daemon_process_unittest.cc',
+        'host/desktop_process.cc',
+        'host/desktop_process.h',
+        'host/desktop_process_unittest.cc',
         'host/desktop_session.cc',
         'host/desktop_session.h',
+        'host/desktop_session_agent.cc',
+        'host/desktop_session_agent.h',
+        'host/desktop_session_agent_posix.cc',
+        'host/desktop_session_agent_win.cc',
         'host/differ_block_unittest.cc',
         'host/differ_unittest.cc',
         'host/heartbeat_sender_unittest.cc',
@@ -2108,8 +2123,6 @@
         'host/video_frame_capturer_helper_unittest.cc',
         'host/video_frame_capturer_mac_unittest.cc',
         'host/video_frame_capturer_unittest.cc',
-        'host/win/launch_process_with_token.cc',
-        'host/win/launch_process_with_token.h',
         'host/win/worker_process_launcher.cc',
         'host/win/worker_process_launcher.h',
         'host/win/worker_process_launcher_unittest.cc',