Adds Build.MANUFACTURER to native BuildInfo wrapper.

R=yfriedman@chromium.org
BUG=None

Review URL: https://codereview.chromium.org/599553002

Cr-Commit-Position: refs/heads/master@{#296257}

base/android/build_info.cc

@@ -44,6 +44,7 @@ struct BuildInfoSingletonTraits {
 
 BuildInfo::BuildInfo(JNIEnv* env)
     : device_(StrDupJString(Java_BuildInfo_getDevice(env))),
+      manufacturer_(StrDupJString(Java_BuildInfo_getDeviceManufacturer(env))),
       model_(StrDupJString(Java_BuildInfo_getDeviceModel(env))),
       brand_(StrDupJString(Java_BuildInfo_getBrand(env))),
       android_build_id_(StrDupJString(Java_BuildInfo_getAndroidBuildId(env))),

base/android/build_info.h

@@ -40,6 +40,10 @@ class BASE_EXPORT BuildInfo {
     return device_;
   }
 
+  const char* manufacturer() const {
+    return manufacturer_;
+  }
+
   const char* model() const {
     return model_;
   }
@@ -98,6 +102,7 @@ class BASE_EXPORT BuildInfo {
   // std::string.c_str() doesn't guarantee that memory won't be allocated when
   // it is called.
   const char* const device_;
+  const char* const manufacturer_;
   const char* const model_;
   const char* const brand_;
   const char* const android_build_id_;

base/android/java/src/org/chromium/base/BuildInfo.java

@@ -54,6 +54,11 @@ public class BuildInfo {
                 0, Math.min(Build.FINGERPRINT.length(), MAX_FINGERPRINT_LENGTH));
     }
 
+    @CalledByNative
+    public static String getDeviceManufacturer() {
+        return Build.MANUFACTURER;
+    }
+
     @CalledByNative
     public static String getDeviceModel() {
         return Build.MODEL;