Merge ChromeServiceTabLauncher and ServiceTabLauncher

chrome/chrome.gyp

 # Copyright (c) 2012 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': {
     'chromium_code': 1,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 479 matching lines @@
             '../components/components.gyp:instance_id_driver_java',
             '../components/components.gyp:invalidation_java',
             '../components/components.gyp:investigated_scenario_java',
             '../components/components.gyp:ntp_tiles_enums_java',
             '../components/components.gyp:navigation_interception_java',
             '../components/components.gyp:offline_page_model_enums_java',
             '../components/components.gyp:policy_java',
             '../components/components.gyp:precache_java',
             '../components/components.gyp:safe_json_java',
             '../components/components.gyp:security_state_enums_java',
-            '../components/components.gyp:service_tab_launcher_java',
             '../components/components.gyp:signin_core_browser_java',
             '../components/components.gyp:variations_java',
             '../components/components.gyp:web_contents_delegate_android_java',
             '../components/components.gyp:web_restrictions_java',
             '../components/components_strings.gyp:components_strings',
             '../content/content.gyp:content_java',
             '../media/media.gyp:media_java',
             '../mojo/mojo_public.gyp:mojo_bindings_java',
             '../mojo/mojo_public.gyp:mojo_public_java',
             '../printing/printing.gyp:printing_java',
@@ skipping 216 matching lines @@
                 'service/service_utility_process_host.cc',
                 'service/service_utility_process_host.h',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }