crash-reporter: Send OS version at time of crash and related improvements

crash_reporter.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 <string>
 
 #include "base/file_util.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 25 matching lines @@
   kCrashKindUncleanShutdown = 1,
   kCrashKindUser = 2,
   kCrashKindKernel = 3,
   kCrashKindMax
 };
 
 static MetricsLibrary s_metrics_lib;
 static SystemLoggingImpl s_system_log;
 
 static bool IsFeedbackAllowed() {
-  // Once crosbug.com/5814 is fixed, call the is opted in function
-  // here.
-  return true;
+  return s_metrics_lib.AreMetricsEnabled();
 }
 
 static bool TouchFile(const FilePath &file_path) {
   return file_util::WriteFile(file_path, "", 0) == 0;
 }
 
 static void CountKernelCrash() {
   s_metrics_lib.SendEnumToUMA(std::string(kCrashCounterHistogram),
                               kCrashKindKernel,
                               kCrashKindMax);
@@ skipping 113 matching lines @@
   }
 
   if (FLAGS_clean_shutdown) {
     unclean_shutdown_collector.Disable();
     user_collector.Disable();
     return 0;
   }
 
   return HandleUserCrash(&user_collector);
 }