Revert of Remote Assistance on Chrome OS Part I - Aura Desktop Capturer (patchset #11 id:220001 of https://codereview.chromium.org/543243003/)

Reason for revert:
This patch appears to cause a Chrome OS bot to break.

http://build.chromium.org/p/chromium.chrome/buildstatus?builder=Google%20Chrome%20ChromeOS&number=71945

Original issue's description:
> Remote Assistance on Chrome OS - Aura Desktop Capturer
>
> This CL implements a WebRTC Desktop Capturer that captures from
> the Aura Shell root window.
>
> The capturer is used by the It2MeHost on Chrome OS.
> |DesktopCaptureDeviceAura| cannot be re-used in our scenario
> because is timer-driven as opposed to caller driven, which is
> required by WebRTC.
>
> The current implementation uses the layer API
>
> desktop_window_->layer()->RequestCopyOfOutput(request.Pass())
>
> to request the layer and its subtree to be rendered to a
> |SkiaBitmap|.  It then copies the pixels to a WebRTC |DesktopFrame|.
>
> BUG=411530
>
> Committed: https://crrev.com/278b065b519617b1e9231bd53e6502706d20787c
> Cr-Commit-Position: refs/heads/master@{#295187}

TBR=sergeyu@chromium.org,dcaiafa@chromium.org,darin@chromium.org,wez@chromium.org,jamescook@chromium.org,reed@google.com,danakj@chromium.org,sky@chromium.org,kelvinp@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=411530

Review URL: https://codereview.chromium.org/579583003

Cr-Commit-Position: refs/heads/master@{#295196}

1 files changed, 64 insertions, 118 deletions

diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
index 25c1529..d7f0e4d 100644
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -12,19 +12,11 @@
   'variables': {
     'conditions': [
       # Remoting host is supported only on Windows, OSX and Linux (with X11).
-      ['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', {
-        'enable_me2me_host': 1,
-        'enable_it2me_host': 1,
+      ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', {
         'enable_remoting_host': 1,
       }, {
-        'enable_me2me_host': 0,
-        'enable_it2me_host': 0,
         'enable_remoting_host': 0,
       }],
-      ['chromeos==1', {
-        'enable_me2me_host': 0,
-        'enable_it2me_host': 0,
-      }],
     ],
   },
 
@@ -72,8 +64,6 @@
             'host/branding.h',
             'host/capture_scheduler.cc',
             'host/capture_scheduler.h',
-            'host/chromeos/aura_desktop_capturer.cc',
-            'host/chromeos/aura_desktop_capturer.h',
             'host/chromium_port_allocator_factory.cc',
             'host/chromium_port_allocator_factory.h',
             'host/chromoting_host.cc',
@@ -297,6 +287,8 @@
           'conditions': [
             ['OS=="linux"', {
               'dependencies': [
+                # Always use GTK on Linux, even for Aura builds.
+                '../build/linux/system.gyp:gtk',
                 '../build/linux/system.gyp:x11',
                 '../build/linux/system.gyp:xext',
                 '../build/linux/system.gyp:xfixes',
@@ -310,39 +302,6 @@
                 ],
               },
             }],
-            ['OS=="linux" and chromeos==0', {
-              'dependencies' : [
-                # Always use GTK on Linux, even for Aura builds.
-                '../build/linux/system.gyp:gtk',
-              ],
-            }],
-            ['chromeos==1', {
-              'dependencies' : [
-                '../ash/ash.gyp:ash',
-                '../cc/cc.gyp:cc',
-                '../content/content.gyp:content',
-                '../ppapi/ppapi_internal.gyp:ppapi_host',
-                '../skia/skia.gyp:skia',
-                '../ui/aura/aura.gyp:aura',
-                '../ui/compositor/compositor.gyp:compositor',
-              ],
-              'include_dirs': [
-                '../third_party/skia/include/utils',
-              ],
-              'sources!' : [
-                'host/continue_window.cc',
-                'host/continue_window.h',
-                'host/continue_window_linux.cc',
-                'host/disconnect_window.cc',
-                'host/disconnect_window_linux.cc',
-                'host/remoting_me2me_host.cc',
-              ]
-            }, {  # chromeos==0
-               'sources!' : [
-                 'host/chromeos/aura_desktop_capturer.cc',
-                 'host/chromeos/aura_desktop_capturer.h',
-               ],
-            }],
             ['OS=="mac"', {
               'dependencies': [
                 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
@@ -439,6 +398,40 @@
         },  # end of target 'remoting_native_messaging_base'
 
         {
+          'target_name': 'remoting_me2me_host_static',
+          'type': 'static_library',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
+            '../net/net.gyp:net',
+            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
+            'remoting_base',
+            'remoting_breakpad',
+            'remoting_host',
+            'remoting_protocol',
+          ],
+          'defines': [
+            'VERSION=<(version_full)',
+          ],
+          'sources': [
+            'host/curtain_mode.h',
+            'host/curtain_mode_linux.cc',
+            'host/curtain_mode_mac.cc',
+            'host/curtain_mode_win.cc',
+            'host/posix/signal_handler.cc',
+            'host/posix/signal_handler.h',
+          ],
+          'conditions': [
+            ['os_posix != 1', {
+              'sources/': [
+                ['exclude', '^host/posix/'],
+              ],
+            }],
+          ],  # end of 'conditions'
+        },  # end of target 'remoting_me2me_host_static'
+
+        {
           'target_name': 'remoting_host_setup_base',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
@@ -488,6 +481,30 @@
           ],
         },  # end of target 'remoting_host_setup_base'
 
+        {
+          'target_name': 'remoting_it2me_host_static',
+          'type': 'static_library',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            '../base/base.gyp:base_i18n',
+            '../net/net.gyp:net',
+            'remoting_base',
+            'remoting_host',
+            'remoting_infoplist_strings',
+            'remoting_protocol',
+            'remoting_resources',
+          ],
+          'defines': [
+            'VERSION=<(version_full)',
+          ],
+          'sources': [
+            'host/it2me/it2me_host.cc',
+            'host/it2me/it2me_host.h',
+            'host/it2me/it2me_native_messaging_host.cc',
+            'host/it2me/it2me_native_messaging_host.h',
+          ],
+        },  # end of target 'remoting_it2me_host_static'
+
         # Generates native messaging manifest files.
         {
           'target_name': 'remoting_native_messaging_manifests',
@@ -600,73 +617,7 @@
       ],  # end of 'targets'
     }],  # 'enable_remoting_host==1'
 
-    ['enable_me2me_host==1', {
-      'targets': [
-        {
-          'target_name': 'remoting_me2me_host_static',
-          'type': 'static_library',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../base/base.gyp:base_i18n',
-            '../net/net.gyp:net',
-            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
-            'remoting_base',
-            'remoting_breakpad',
-            'remoting_host',
-            'remoting_protocol',
-          ],
-          'defines': [
-            'VERSION=<(version_full)',
-          ],
-          'sources': [
-            'host/curtain_mode.h',
-            'host/curtain_mode_linux.cc',
-            'host/curtain_mode_mac.cc',
-            'host/curtain_mode_win.cc',
-            'host/posix/signal_handler.cc',
-            'host/posix/signal_handler.h',
-          ],
-          'conditions': [
-            ['os_posix != 1', {
-              'sources/': [
-                ['exclude', '^host/posix/'],
-              ],
-            }],
-          ],  # end of 'conditions'
-        },  # end of target 'remoting_me2me_host_static'
-      ] # end of targets
-    }], # end of enable_me2me_host==1
-
-    ['enable_it2me_host==1', {
-      'targets': [
-        {
-          'target_name': 'remoting_it2me_host_static',
-          'type': 'static_library',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            '../base/base.gyp:base_i18n',
-            '../net/net.gyp:net',
-            'remoting_base',
-            'remoting_host',
-            'remoting_infoplist_strings',
-            'remoting_protocol',
-            'remoting_resources',
-          ],
-          'defines': [
-            'VERSION=<(version_full)',
-          ],
-          'sources': [
-            'host/it2me/it2me_host.cc',
-            'host/it2me/it2me_host.h',
-            'host/it2me/it2me_native_messaging_host.cc',
-            'host/it2me/it2me_native_messaging_host.h',
-          ],
-        },  # end of target 'remoting_it2me_host_static'
-      ] # end of targets
-    }], # end of 'enable_it2me_host==1'
-
-    ['OS!="win" and enable_me2me_host==1', {
+    ['OS!="win" and enable_remoting_host==1', {
       'targets': [
         {
           'target_name': 'remoting_me2me_host',
@@ -844,11 +795,6 @@
             }],  # OS=mac
           ],
         },  # end of target 'remoting_me2me_native_messaging_host'
-      ], # targets
-    }], # end of OS!="win" and enable_me2me_host==1
-
-    ['OS!="win" and enable_it2me_host==1', {
-      'targets': [
         {
           'target_name': 'remoting_it2me_native_messaging_host',
           'type': 'executable',
@@ -872,7 +818,7 @@
             'host/it2me/it2me_native_messaging_host_main.h',
           ],
           'conditions': [
-            ['OS=="linux" and chromeos==0', {
+            ['OS=="linux"', {
               'dependencies': [
                 # Always use GTK on Linux, even for Aura builds.
                 '../build/linux/system.gyp:gtk',
@@ -944,7 +890,7 @@
           ],
         },  # end of target 'remoting_it2me_native_messaging_host'
       ],  # end of 'targets'
-    }],  # # end of OS!="win" and enable_it2me_host==1
+    }],  # OS!="win"
 
   ],  # end of 'conditions'
 }