Change chrome android to use content_app_both

chrome/chrome_android.gypi

 # 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,
     'conditions': [
       ['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', {
         # Only enable the chromium linker on regular builds, since the
         # component build crashes on Android 4.4. See b/11379966
@@ skipping 14 matching lines @@
         'chrome.gyp:browser',
         'chrome.gyp:browser_ui',
         'chrome.gyp:child',
         'chrome.gyp:plugin',
         'chrome.gyp:renderer',
         'chrome.gyp:utility',
         # TODO(kkimlabs): Move this to chrome.gyp:browser when the dependent
         #                 is upstreamed.
         '../components/components.gyp:enhanced_bookmarks',
         '../content/content.gyp:content',
-        '../content/content.gyp:content_app_browser',
+        '../content/content.gyp:content_app_both',
       ],
       'include_dirs': [
         '..',
         '<(android_ndk_include)',
       ],
       'sources': [
         'app/android/chrome_android_initializer.cc',
         'app/android/chrome_android_initializer.h',
         'app/android/chrome_jni_onload.cc',
         'app/android/chrome_main_delegate_android.cc',
@@ skipping 58 matching lines @@
             '-f', '<(branding_path)',
             '-e', 'CHANNEL=str.upper("<(android_channel)")',
             '<(template_input_path)',
             '<(output_path)',
           ],
         },
       ],
     },
   ],
 }