Fix CustomTabs.ClientAppId counting.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
index 9f29e9a13ace3c9a17820e1ea45f468b76dc7ee1..a7445bf843a06454a023a6e6639bd3b84b66e364 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
@@ -90,7 +90,6 @@ public class CustomTabActivity extends ChromeActivity {
     // change the package name.
     private boolean mShouldOverridePackage;
 
-    private boolean mRecordedStartupUma;
     private boolean mHasCreatedTabEarly;
     private boolean mIsInitialStart = true;
     private boolean mHasPrerender;
@@ -425,17 +424,14 @@ public class CustomTabActivity extends ChromeActivity {
         super.onStartWithNative();
         setActiveContentHandler(mCustomTabContentHandler);
 
-        if (!mRecordedStartupUma) {
-            mRecordedStartupUma = true;
+        if (getSavedInstanceState() != null || !mIsInitialStart) {
+            RecordUserAction.record("CustomTabs.StartedReopened");
+        } else {
             ExternalAppId externalId =
                     IntentHandler.determineExternalIntentSource(getPackageName(), getIntent());
             RecordHistogram.recordEnumeratedHistogram("CustomTabs.ClientAppId",
                     externalId.ordinal(), ExternalAppId.INDEX_BOUNDARY.ordinal());
-        }
 
-        if (getSavedInstanceState() != null || !mIsInitialStart) {
-            RecordUserAction.record("CustomTabs.StartedReopened");
-        } else {
             RecordUserAction.record("CustomTabs.StartedInitially");
         }
         mIsInitialStart = false;