Merge ChromeMainDelegateStagingAndroid into ChromeMainDelegateAndroid.

chrome/android/chrome_apk.gyp

 # Copyright 2015 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.
 {
   'includes': [
     '../../chrome/chrome_android_paks.gypi', # Included for the list of pak resources.
     '../../build/util/version.gypi'
    ],
   'variables': {
     'chromium_code': 1,
     'package_name': 'chrome_public_apk',
     'manifest_package': 'org.chromium.chrome',
     'sync_shell_manifest_package': 'org.chromium.chrome.sync_shell',
     'chrome_public_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public_apk_manifest/AndroidManifest.xml',
     'chrome_public_test_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public_test_apk_manifest/AndroidManifest.xml',
     'chrome_sync_shell_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_sync_shell_apk_manifest/AndroidManifest.xml',
     'chrome_sync_shell_test_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_sync_shell_test_apk_manifest/AndroidManifest.xml',
     # This list is shared with GN.
     # Defines a list of source files should be present in the open-source
     # chrome-apk but not in the published static_library which is included in the
     # real chrome for android.
     'chrome_public_app_native_sources': [
+      '../app/android/chrome_main_delegate_android_initializer.cc',
       '../browser/android/chrome_entry_point.cc',
-      '../browser/android/chrome_main_delegate_staging_android_initializer.cc',
     ],
   },
   'targets': [
     {
       #GN: //chrome/android::custom_tabs_service_aidl
       'target_name': 'custom_tabs_service_aidl',
       'type': 'none',
       'variables': {
         'aidl_interface_file': 'java/src/android/support/customtabs/common.aidl',
         'aidl_import_include': 'java/src/android/support/customtabs',
@@ skipping 346 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: