Upstream native crash handling changes for Android.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a852e955b8fc85aeb3fbb1085dcf38336dc9edf1..53fc1181c5cd1e712b5f8af88e5609af6793a1fa 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -948,7 +948,6 @@
         'browser/content_settings/tab_specific_content_settings.h',
         'browser/cookies_tree_model.cc',
         'browser/cookies_tree_model.h',
-        'browser/crash_handler_host_linux.h',
         'browser/crash_upload_list.cc',
         'browser/crash_upload_list.h',
         'browser/crash_upload_list_win.cc',
@@ -4311,18 +4310,19 @@
             ['exclude', '^browser/ui/webui/keyboard_ui.*'],
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "android"', {
+        ['os_posix == 1 and OS != "mac"', {
           'link_settings': {
             'libraries': [
               '-lXss',
             ],
           },
+          'sources': [ 'browser/crash_handler_host_posix.h', ],
           'conditions': [
-            ['linux_breakpad==1', {
+            ['posix_breakpad==1', {
               'sources': [
-                'app/breakpad_linux.cc',
-                'app/breakpad_linux.h',
-                'browser/crash_handler_host_linux.cc',
+                'app/breakpad_posix.cc',
+                'app/breakpad_posix.h',
+                'browser/crash_handler_host_posix.cc',
               ],
               'dependencies': [
                 '../breakpad/breakpad.gyp:breakpad_client',
@@ -4334,9 +4334,9 @@
                 '<(SHARED_INTERMEDIATE_DIR)',
                 '../breakpad/src',
               ],
-            }, {  # linux_breakpad==0
+            }, {  # posix_breakpad==0
               'sources': [
-                'browser/crash_handler_host_linux_stub.cc',
+                'browser/crash_handler_host_posix_stub.cc',
               ],
             }],
           ],