Update to Chromium //base at Chromium commit 3e81715e6d3a4324362635aea46ce1f1a163cca1.

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 "base/base_export.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.
 enum SdkVersion {
   SDK_VERSION_JELLY_BEAN = 16,
   SDK_VERSION_JELLY_BEAN_MR1 = 17,
   SDK_VERSION_JELLY_BEAN_MR2 = 18,
   SDK_VERSION_KITKAT = 19,
   SDK_VERSION_KITKAT_WEAR = 20,
   SDK_VERSION_LOLLIPOP = 21,
-  SDK_VERSION_LOLLIPOP_MR1 = 22
+  SDK_VERSION_LOLLIPOP_MR1 = 22,
+  SDK_VERSION_MARSHMALLOW = 23
 };
 
 // BuildInfo is a singleton class that stores android build and device
 // information. It will be called from Android specific code and gets used
 // primarily in crash reporting.
 
 // It is also used to store the last java exception seen during JNI.
 // TODO(nileshagrawal): Find a better place to store this info.
 class BASE_EXPORT BuildInfo {
  public:
@@ skipping 95 matching lines @@
   // 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_