Revert 131404 - Upstream native crash handling changes for Android.

Android native crash handling is almost identical to linux handling with
some differences.

Note that even after this change Chrome on Android will not compile with
the USE_LINUX_BREAKPAD flag. Forthcomming changes in breakpad should
remedy this state of affairs.

BUG=
TEST=


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

TBR=carlosvaldivia@google.com
Review URL: https://chromiumcodereview.appspot.com/9999004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131420 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 0 insertions, 248 deletions

diff --git a/base/android/build_info.cc b/base/android/build_info.cc
deleted file mode 100644
index 54be7a2..0000000
--- a/base/android/build_info.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// 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.
-
-#include "base/android/build_info.h"
-
-#include <string>
-
-#include "base/android/jni_android.h"
-#include "base/android/jni_string.h"
-#include "base/android/scoped_java_ref.h"
-#include "base/logging.h"
-#include "base/memory/singleton.h"
-#include "jni/build_info_jni.h"
-
-namespace base {
-namespace android {
-
-BuildInfo::BuildInfo() {
-
-  JNIEnv* env = AttachCurrentThread();
-
-  // The const char* pointers initialized below will be owned by the
-  // resultant BuildInfo.
-  std::string device_str =
-      ConvertJavaStringToUTF8(Java_BuildInfo_getDevice(env));
-  device_ = strdup(device_str.c_str());
-
-  std::string model_str =
-      ConvertJavaStringToUTF8(Java_BuildInfo_getDeviceModel(env));
-  model_ = strdup(model_str.c_str());
-
-  std::string brand_str =
-      ConvertJavaStringToUTF8(Java_BuildInfo_getBrand(env));
-  brand_ = strdup(brand_str.c_str());
-
-  std::string android_build_id_str =
-      ConvertJavaStringToUTF8(Java_BuildInfo_getAndroidBuildId(env));
-  android_build_id_ = strdup(android_build_id_str.c_str());
-
-  std::string android_build_fp_str =
-      ConvertJavaStringToUTF8(Java_BuildInfo_getAndroidBuildFingerprint(env));
-  android_build_fp_ = strdup(android_build_fp_str.c_str());
-
-  jobject app_context = GetApplicationContext();
-  std::string package_version_code_str =
-      ConvertJavaStringToUTF8(Java_BuildInfo_getPackageVersionCode(
-          env, app_context));
-  package_version_code_ = strdup(package_version_code_str.c_str());
-
-  std::string package_version_name_str =
-      ConvertJavaStringToUTF8(
-          Java_BuildInfo_getPackageVersionName(env, app_context));
-  package_version_name_ = strdup(package_version_name_str.c_str());
-
-}
-
-// static
-BuildInfo* BuildInfo::GetInstance() {
-  return Singleton<BuildInfo, LeakySingletonTraits<BuildInfo> >::get();
-}
-
-bool RegisterBuildInfo(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
-}  // namespace android
-}  // namespace base
diff --git a/base/android/build_info.h b/base/android/build_info.h
deleted file mode 100644
index 82635cd..0000000
--- a/base/android/build_info.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// 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.
-
-#ifndef BASE_ANDROID_BUILD_INFO_H_
-#define BASE_ANDROID_BUILD_INFO_H_
-
-#include <jni.h>
-
-#include <string>
-
-#include "base/memory/singleton.h"
-
-namespace base {
-namespace android {
-
-// BuildInfo is a singleton class that stores android build and device
-// information.
-class BuildInfo {
- public:
-
-  ~BuildInfo() {}
-
-  // Static factory method for getting the singleton BuildInfo instance.
-  // Note that ownership is not conferred on the caller and the BuildInfo in
-  // question isn't actually freed until shutdown. This is ok because there
-  // should only be one instance of BuildInfo ever created.
-  static BuildInfo* GetInstance();
-
-  // Const char* is used instead of std::strings because these values must be
-  // 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 {
-    return device_;
-  }
-
-  const char* model() const {
-    return model_;
-  }
-
-  const char* brand() const {
-    return brand_;
-  }
-
-  const char* android_build_id() const {
-    return android_build_id_;
-  }
-
-  const char* android_build_fp() const {
-    return android_build_fp_;
-  }
-
-  const char* package_version_code() const {
-    return package_version_code_;
-  }
-
-  const char* package_version_name() const {
-    return package_version_name_;
-  }
-
- private:
-  BuildInfo();
-
-  friend struct DefaultSingletonTraits<BuildInfo>;
-
-  // Const char* is used instead of std::strings because these values must be
-  // 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.
-  char* device_;
-  char* model_;
-  char* brand_;
-  char* android_build_id_;
-  char* android_build_fp_;
-  char* package_version_code_;
-  char* package_version_name_;
-
-  DISALLOW_COPY_AND_ASSIGN(BuildInfo);
-
-};
-
-bool RegisterBuildInfo(JNIEnv* env);
-
-}  // namespace android
-}  // namespace base
-
-#endif  // BASE_ANDROID_BUILD_INFO_H_
diff --git a/base/android/java/org/chromium/base/BuildInfo.java b/base/android/java/org/chromium/base/BuildInfo.java
deleted file mode 100644
index 75748ac..0000000
--- a/base/android/java/org/chromium/base/BuildInfo.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// 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.
-
-package org.chromium.base;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Build;
-import android.util.Log;
-
-/**
- * BuildInfo is a utility class providing easy access to {@link PackageInfo}
- * information. This is primarly of use for accessesing package information
- * from native code.
- */
-public class BuildInfo {
-  private static final String TAG = "BuildInfo";
-  private static final int MAX_FINGERPRINT_LENGTH = 128;
-
-  /**
-   * BuildInfo is a static utility class and therefore should'nt be
-   * instantiated.
-   */
-  private BuildInfo() {
-  }
-
-  @CalledByNative
-  public static String getDevice() {
-    return Build.DEVICE;
-  }
-
-  @CalledByNative
-  public static String getBrand() {
-    return Build.BRAND;
-  }
-
-  @CalledByNative
-  public static String getAndroidBuildId() {
-    return Build.ID;
-  }
-
-  /**
-   * @return The build fingerprint for the current Android install.  The value is truncated to a
-   *         128 characters as this is used for crash and UMA reporting, which should avoid huge
-   *         strings.
-   */
-  @CalledByNative
-  public static String getAndroidBuildFingerprint() {
-      return Build.FINGERPRINT.substring(
-              0, Math.min(Build.FINGERPRINT.length(), MAX_FINGERPRINT_LENGTH));
-  }
-
-  @CalledByNative
-  public static String getDeviceModel() {
-    return Build.MODEL;
-  }
-
-  @CalledByNative
-  public static String getPackageVersionCode(Context context) {
-    String msg = "versionCode not available.";
-    try {
-      PackageManager pm = context.getPackageManager();
-      PackageInfo pi = pm.getPackageInfo("com.android.chrome", 0);
-      msg = "" + pi.versionCode;
-    } catch (NameNotFoundException e) {
-      Log.d(TAG, msg);
-    }
-    return msg;
-
-  }
-
-  @CalledByNative
-  public static String getPackageVersionName(Context context) {
-    String msg = "versionName not available";
-    try {
-      PackageManager pm = context.getPackageManager();
-      PackageInfo pi = pm.getPackageInfo("com.android.chrome", 0);
-      msg = pi.versionName;
-    } catch (NameNotFoundException e) {
-      Log.d(TAG, msg);
-    }
-    return msg;
-  }
-
-}
diff --git a/base/base.gyp b/base/base.gyp
index c6058873..4225f7e 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -122,12 +122,10 @@
           'action_name': 'generate_jni_headers',
           'inputs': [
             'android/jni_generator/jni_generator.py',
-            'android/java/org/chromium/base/BuildInfo.java',
             'android/java/org/chromium/base/PathUtils.java',
             'android/java/org/chromium/base/SystemMessageHandler.java',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/base/jni/build_info_jni.h',
             '<(SHARED_INTERMEDIATE_DIR)/base/jni/path_utils_jni.h',
             '<(SHARED_INTERMEDIATE_DIR)/base/jni/system_message_handler_jni.h',
           ],
diff --git a/base/base.gypi b/base/base.gypi
index 6d93c12..f9fb0c0 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -21,8 +21,6 @@
           'third_party/nspr/prtime.h',
           'third_party/nspr/prcpucfg_linux.h',
           'third_party/xdg_mime/xdgmime.h',
-          'android/build_info.cc',
-          'android/build_info.h',
           'android/scoped_java_ref.cc',
           'android/scoped_java_ref.h',
           'android/jni_android.cc',