Upstream native crash handling changes for Android.

chrome/browser/metrics/metrics_service_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.
 
 // Tests the MetricsService stat recording to make sure that the numbers are
 // what we expect.
 
 #include <string>
 
 #include "base/file_path.h"
@@ skipping 76 matching lines @@
 
     scoped_refptr<BrowserProxy> window = automation()->GetBrowserWindow(0);
     ASSERT_TRUE(window.get());
 
     // Kill the process for one of the tabs.
     scoped_refptr<TabProxy> tab(window->GetTab(1));
     ASSERT_TRUE(tab.get());
 
     // We can get crash dumps on Windows always, Linux when breakpad is
     // enabled, and all platforms for official Google Chrome builds.
-#if defined(OS_WIN) || defined(USE_LINUX_BREAKPAD) || \
+#if defined(OS_WIN) || defined(USE_POSIX_BREAKPAD) || \
     defined(GOOGLE_CHROME_BUILD)
     expected_crashes_ = 1;
 #endif
     ASSERT_TRUE(tab->NavigateToURLAsync(GURL(chrome::kChromeUICrashURL)));
   }
 
   // Give the browser a chance to notice the crashed tab.
   base::PlatformThread::Sleep(TestTimeouts::action_timeout());
 
   QuitBrowser();
 
   scoped_ptr<PrefService> local_state(GetLocalState());
   local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly, true);
   local_state->RegisterIntegerPref(prefs::kStabilityLaunchCount, 0);
   local_state->RegisterIntegerPref(prefs::kStabilityPageLoadCount, 0);
   local_state->RegisterIntegerPref(prefs::kStabilityRendererCrashCount, 0);
   EXPECT_TRUE(local_state->GetBoolean(prefs::kStabilityExitedCleanly));
   EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityLaunchCount));
 #if defined(USE_VIRTUAL_KEYBOARD)
   // The keyboard page loads.
   EXPECT_EQ(5, local_state->GetInteger(prefs::kStabilityPageLoadCount));
 #else
   EXPECT_EQ(4, local_state->GetInteger(prefs::kStabilityPageLoadCount));
 #endif
   EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityRendererCrashCount));
 }