Upstream native crash handling changes for Android.

base/android/build_info.h

+// Copyright (c) 2011 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.
+
+#ifndef BASE_ANDROID_BUILD_INFO_H_
+#define BASE_ANDROID_BUILD_INFO_H_
+
+#include <jni.h>
+#include <string>
+
+namespace base {
+namespace android {
+
+
+// BuildInfo is a singleton class that stores android build and device

[Yaron, 2012/03/26 18:51:15]

Seems like you could be using base/memory/singleton.h. The comments in there
explain how to use it.

[carlosvaldivia, 2012/04/03 06:24:47]

singleton.h doesn't appear to play well with zero-argument constructors. Also it
seems dangerous to make the various fields non-const.

On 2012/03/26 18:51:15, Yaron wrote:

[Yaron, 2012/04/03 23:54:20]

I see examples of it already. E.g. CountryDataMap in
chrome/browser/autofill/autofill_country.cc

Also it
Why is it dangerous? Because they're public?

[carlosvaldivia, 2012/04/04 20:52:34]

I meant non-zero argument constructors like the one found in this class.

Its dangerous because they are public and mutable and they shouldn't be.

If you insist, I'll use the singleton.h stuff. I do think there is some utility
in conforming to the broader chrome idiom. But in this particular case it
appears to make the code more complicated and fragile. 

On 2012/04/03 23:54:20, Yaron wrote:

+// information.
+class BuildInfo {
+ public:
+
+  // Static factory method for getting the singleton BuildInfo instance.
+  static const BuildInfo* const GetInstance();
+
+  ~BuildInfo() {};
+
+  // We use const char* instead of std::strings because we need to have these
+  // values available even if the process is in a crash state. Sadly
+  // std::string.c_str() doesn't guarantee that memory won't be allocated when
+  // it is called.
+  const char* device;
+  const char* model;
+  const char* brand;
+  const char* android_build_id;
+  const char* android_build_fp;
+  const char* package_version_code;
+  const char* package_version_name;
+
+ private:
+  static BuildInfo* instance_;
+
+  BuildInfo(
+      const char* device,
+      const char* model,
+      const char* brand,
+      const char* android_build_id,
+      const char* android_build_fp,
+      const char* package_version_code,
+      const char* package_version_name);
+
+};
+
+bool RegisterBuildInfo(JNIEnv* env);
+
+}  // namespace android
+}  // namespace base
+
+
+#endif  // BASE_ANDROID_BUILD_INFO_H_