Revert "Modify crash-reporter to collect crash information for unofficial builds."

This reverts commit cb5a147e46dbfa454df9d56b4da23480742597c8.

BUG=None
TEST=

Review URL: http://codereview.chromium.org/6596045

Change-Id: If07530a743b19a76e9a15ef08825c45c38f9dd2b
diff --git a/crash_reporter/crash_collector.cc b/crash_reporter/crash_collector.cc
index bdad63f..afd72d1 100644
--- a/crash_reporter/crash_collector.cc
+++ b/crash_reporter/crash_collector.cc
@@ -24,7 +24,6 @@
 static const char kShellPath[] = "/bin/sh";
 static const char kSystemCrashPath[] = "/var/spool/crash";
 static const char kUserCrashPath[] = "/home/chronos/user/crash";
-static const char kCrashTestInProgressPath[] = "/tmp/crash-test-in-progress";
 
 // Directory mode of the user crash spool directory.
 static const mode_t kUserCrashPathMode = 0755;
@@ -411,7 +410,3 @@
     logger_->LogError("Unable to write %s", meta_path.value().c_str());
   }
 }
-
-bool CrashCollector::IsCrashTestInProgress() {
-  return file_util::PathExists(FilePath(kCrashTestInProgressPath));
-}
diff --git a/crash_reporter/crash_collector.h b/crash_reporter/crash_collector.h
index 6680399..f3fcbe5 100644
--- a/crash_reporter/crash_collector.h
+++ b/crash_reporter/crash_collector.h
@@ -138,9 +138,6 @@
                           const std::string &exec_name,
                           const std::string &payload_path);
 
-  // Returns true if the a crash test is currently running.
-  bool IsCrashTestInProgress();
-
   CountCrashFunction count_crash_function_;
   IsFeedbackAllowedFunction is_feedback_allowed_function_;
   SystemLogging *logger_;
diff --git a/crash_reporter/user_collector.cc b/crash_reporter/user_collector.cc
index 13df5ce..6e6c765 100644
--- a/crash_reporter/user_collector.cc
+++ b/crash_reporter/user_collector.cc
@@ -472,13 +472,6 @@
   logger_->LogWarning("Received crash notification for %s[%d] sig %d (%s)",
                       exec.c_str(), pid, signal, handling_string);
 
-  // For developer builds, we always want to keep the crash reports unless
-  // we're testing the crash facilities themselves.
-  if (file_util::PathExists(FilePath(kLeaveCoreFile)) &&
-      !IsCrashTestInProgress()) {
-    feedback = true;
-  }
-
   if (feedback) {
     count_crash_function_();