On Android, the app package name defines a distribution channel

BUG=159476


Review URL: https://chromiumcodereview.appspot.com/11368146

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

3 files changed, 13 insertions, 0 deletions

diff --git a/base/android/build_info.cc b/base/android/build_info.cc
index 0414efa..273cbbd 100644
--- a/base/android/build_info.cc
+++ b/base/android/build_info.cc
@@ -53,6 +53,8 @@ BuildInfo::BuildInfo(JNIEnv* env)
           env, GetApplicationContext()))),
       package_label_(StrDupJString(Java_BuildInfo_getPackageLabel(
           env, GetApplicationContext()))),
+      package_name_(StrDupJString(Java_BuildInfo_getPackageName(
+          env, GetApplicationContext()))),
       java_exception_info_(NULL) {
 }
 
diff --git a/base/android/build_info.h b/base/android/build_info.h
index 3714071..65f45b5f 100644
--- a/base/android/build_info.h
+++ b/base/android/build_info.h
@@ -67,6 +67,10 @@ class BuildInfo {
     return package_label_;
   }
 
+  const char* package_name() const {
+    return package_name_;
+  }
+
   const char* java_exception_info() const {
     return java_exception_info_;
   }
@@ -92,6 +96,7 @@ class BuildInfo {
   const char* const package_version_code_;
   const char* const package_version_name_;
   const char* const package_label_;
+  const char* const package_name_;
   // This is set via set_java_exception_info, not at constructor time.
   const char* java_exception_info_;
 
diff --git a/base/android/java/src/org/chromium/base/BuildInfo.java b/base/android/java/src/org/chromium/base/BuildInfo.java
index dc2be6b..1bd3fa2 100644
--- a/base/android/java/src/org/chromium/base/BuildInfo.java
+++ b/base/android/java/src/org/chromium/base/BuildInfo.java
@@ -100,4 +100,10 @@ public class BuildInfo {
             return "";
         }
     }
+
+    @CalledByNative
+    public static String getPackageName(Context context) {
+        String packageName = context != null ? context.getPackageName() : null;
+        return packageName != null ? packageName : "";
+    }
 }