crash-reporter: Ignore Chrome crashes, relying on Chrome breakpad

user_collector_test.cc

 // Copyright (c) 2010 The Chromium OS 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 <unistd.h>
 
 #include "base/file_util.h"
 #include "crash-reporter/system_logging_mock.h"
 #include "crash-reporter/user_collector.h"
 #include "gflags/gflags.h"
@@ skipping 136 matching lines @@
   logging_.clear();
   args.clear();
   args.push_back(kBinBash);
   args.push_back("-c");
   args.push_back("kill -SEGV $$");
   EXPECT_EQ(-1, collector_.ForkExecAndPipe(args, output_file));
   EXPECT_NE(std::string::npos,
             logging_.log().find("Process did not exit normally"));
 }
 
-TEST_F(UserCollectorTest, HandleCrashWithoutMetrics) {
+TEST_F(UserCollectorTest, HandleNonChromeCrashWithoutMetrics) {
   s_metrics = false;
   collector_.HandleCrash(10, 20, "foobar");
-  ASSERT_NE(logging_.log().find(
-      "Received crash notification for foobar[20] sig 10"),
-      std::string::npos);
+  ASSERT_NE(std::string::npos,
+            logging_.log().find(
+                "Received crash notification for foobar[20] sig 10"));
   ASSERT_EQ(s_crashes, 0);
 }
 
-TEST_F(UserCollectorTest, HandleCrashWithMetrics) {
+TEST_F(UserCollectorTest, HandleNonChromeCrashWithMetrics) {
+  s_metrics = true;
+  collector_.HandleCrash(2, 5, "chromeos-wm");
+  ASSERT_NE(std::string::npos,
+            logging_.log().find(
+                "Received crash notification for chromeos-wm[5] sig 2"));
+  ASSERT_EQ(s_crashes, 1);
+}
+
+TEST_F(UserCollectorTest, HandleChromeCrashWithMetrics) {
   s_metrics = true;
   collector_.HandleCrash(2, 5, "chrome");
-  ASSERT_NE(logging_.log().find(
-      "Received crash notification for chrome[5] sig 2"),
-      std::string::npos);
-  ASSERT_EQ(s_crashes, 1);
+  ASSERT_NE(std::string::npos,
+            logging_.log().find(
+                "Received crash notification for chrome[5] sig 2"));
+  ASSERT_NE(std::string::npos,
+            logging_.log().find("(ignoring - chrome crash)"));
+  ASSERT_EQ(s_crashes, 0);
 }
 
 TEST_F(UserCollectorTest, GetProcessPath) {
   FilePath path = collector_.GetProcessPath(100);
   ASSERT_EQ("/proc/100", path.value());
 }
 
 TEST_F(UserCollectorTest, GetSymlinkTarget) {
   FilePath result;
   ASSERT_FALSE(collector_.GetSymlinkTarget(FilePath("/does_not_exist"),
@@ skipping 133 matching lines @@
     EXPECT_EQ(expectations[i].exists,
               file_util::PathExists(
                   container_path.Append(expectations[i].name)));
   }
 }
 
 int main(int argc, char **argv) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }