Revert of Android: Refactor BuildInfo to use less jni and remove StrictMode exception

base/android/build_info.h

 // 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 <vector>
 
 #include "base/base_export.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 
 namespace base {
 namespace android {
 
 // This enumeration maps to the values returned by BuildInfo::sdk_int(),
 // indicating the Android release associated with a given SDK version.
@@ skipping 88 matching lines @@
     return java_exception_info_;
   }
 
   void SetJavaExceptionInfo(const std::string& info);
 
   void ClearJavaExceptionInfo();
 
  private:
   friend struct BuildInfoSingletonTraits;
 
-  explicit BuildInfo(const std::vector<std::string>& params);
+  explicit BuildInfo(JNIEnv* env);
 
   // 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* const brand_;
   const char* const device_;
-  const char* const android_build_id_;
   const char* const manufacturer_;
   const char* const model_;
-  const int sdk_int_;
-  const char* const build_type_;
+  const char* const brand_;
+  const char* const android_build_id_;
+  const char* const android_build_fp_;
+  const char* const gms_version_code_;
+  const char* const package_version_code_;
+  const char* const package_version_name_;
   const char* const package_label_;
   const char* const package_name_;
-  const char* const package_version_code_;
-  const char* const package_version_name_;
-  const char* const android_build_fp_;
-  const char* const gms_version_code_;
+  const char* const build_type_;
   // Not needed by breakpad.
   const std::string extracted_file_suffix_;
+  const int sdk_int_;
   // This is set via set_java_exception_info, not at constructor time.
   const char* java_exception_info_;
 
   DISALLOW_COPY_AND_ASSIGN(BuildInfo);
 };
 
 }  // namespace android
 }  // namespace base
 
 #endif  // BASE_ANDROID_BUILD_INFO_H_