Merge ChromeServiceTabLauncher and ServiceTabLauncher

components/components.gyp

 # Copyright (c) 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.
 
 {
   'variables': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 92 matching lines @@
     'version_ui.gypi',
     'web_resource.gypi',
     'web_restrictions.gypi',
     'webdata.gypi',
     'webdata_services.gypi',
   ],
   'conditions': [
     ['OS == "android"', {
       'includes': [
         'external_video_surface.gypi',
-        'service_tab_launcher.gypi',
       ],
     }],
     ['OS != "ios"', {
       'includes': [
         'app_modal.gypi',
         'browsing_data.gypi',
         'cdm.gypi',
         'certificate_transparency.gypi',
         'contextual_search.gypi',
         'devtools_discovery.gypi',
@@ skipping 88 matching lines @@
         'rlz.gypi',
       ],
     }],
     ['use_ash==1', {
       'includes': [
         'exo.gypi',
       ],
     }],
   ],
 }