Add a new rappor metric to record all package names excluding GSA

BUG=679085

Review-Url: https://codereview.chromium.org/2619663002
Cr-Commit-Position: refs/heads/master@{#442694}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

@@ -54,6 +54,7 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
 import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
 import org.chromium.chrome.browser.fullscreen.BrowserStateBrowserControlsVisibilityDelegate;
+import org.chromium.chrome.browser.gsa.GSAState;
 import org.chromium.chrome.browser.metrics.PageLoadMetrics;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.pageinfo.WebsiteSettingsPopup;
@@ -565,6 +566,9 @@ public class CustomTabActivity extends ChromeActivity {
             public void run() {
                 RapporServiceBridge.sampleString(
                         "CustomTabs.ServiceClient.PackageName", packageName);
+                if (GSAState.isGsaPackageName(packageName)) return;
+                RapporServiceBridge.sampleString(
+                        "CustomTabs.ServiceClient.PackageNameThirdParty", packageName);
             }
         });
     }

chrome/android/java/src/org/chromium/chrome/browser/gsa/GSAState.java

@@ -62,6 +62,13 @@ public class GSAState {
         return sGSAState;
     }
 
+    /**
+     * @return Whether the given package name is the package name for Google Search App.
+     */
+    public static boolean isGsaPackageName(String packageName) {
+        return SEARCH_INTENT_PACKAGE.equals(packageName);
+    }
+
     /* Private constructor, since this is a singleton */
     private GSAState(Context context) {
         mContext = context.getApplicationContext();

tools/metrics/rappor/rappor.xml

@@ -881,6 +881,15 @@ components/rappor/rappor_parameters.h.
   </summary>
 </rappor-metric>
 
+<rappor-metric name="CustomTabs.ServiceClient.PackageNameThirdParty"
+    type="UMA_RAPPOR_TYPE">
+  <owner>yusufo@chromium.org</owner>
+  <summary>
+    The package name for a client that has connected through the custom tabs
+    service excluding Google Search App.
+  </summary>
+</rappor-metric>
+
 <rappor-metric name="DeviceSensors.DeviceMotion" type="ETLD_PLUS_ONE">
   <owner>timvolodine@chromium.org</owner>
   <summary>