Upstream crash changes for android.

chrome/common/logging_chrome_uitest.cc

 // 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.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 48 matching lines @@
 TEST_F(ChromeLoggingTest, EnvironmentLogFileName) {
   SaveEnvironmentVariable("test value");
 
   FilePath filename = logging::GetLogFileName();
   ASSERT_EQ(FilePath(FILE_PATH_LITERAL("test value")).value(),
             filename.value());
 
   RestoreEnvironmentVariable();
 }
 
-#if defined(OS_LINUX) && (!defined(NDEBUG) || !defined(USE_LINUX_BREAKPAD))
+#if (defined(OS_LINUX) || defined(OS_ANDROID)) \
+    && (!defined(NDEBUG) || !defined(USE_LINUX_BREAKPAD))
 // On Linux in Debug mode, Chrome generates a SIGTRAP.
 // we do not catch SIGTRAPs, thus no crash dump.
 // This also does not work if Breakpad is disabled.
 #define EXPECTED_ASSERT_CRASHES 0
 #else
 #define EXPECTED_ASSERT_CRASHES 1
 #endif
 
 // Virtual keyboard build will start an extra renderer process (the extension
 // process) for the virtual keyboard.
@@ skipping 62 matching lines @@
  protected:
   RendererCrashTest() {
 #if defined(OS_WIN)
     // TODO(phajdan.jr): Make crash notifications on launch work on Win.
     wait_for_initial_loads_ = false;
 #endif
     launch_arguments_.AppendSwitch(switches::kRendererCrashTest);
   }
 };
 
-#if defined(OS_LINUX) && !defined(USE_LINUX_BREAKPAD)
+#if (defined(OS_LINUX) || defined(OS_ANDROID)) && !defined(USE_LINUX_BREAKPAD)
 // On Linux, do not expect a crash dump if Breakpad is disabled.
 #define EXPECTED_CRASH_CRASHES 0
 #else
 #define EXPECTED_CRASH_CRASHES 1
 #endif
 
 #if defined(OS_MACOSX)
 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
 #define MAYBE_Crash DISABLED_Crash
 #elif defined(OS_CHROMEOS)
 #define MAYBE_Crash DISABLED_Crash
 #else
 #define MAYBE_Crash Crash
 #endif
 // Launch the app in renderer crash test mode, then close the app.
 TEST_F(RendererCrashTest, MAYBE_Crash) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
   expected_crashes_ = EXPECTED_CRASH_CRASHES;
 }