Fix CustomTabs.ClientAppId counting.

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

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.customtabs;
 
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ skipping 72 matching lines @@
     private CustomTabContentHandler mCustomTabContentHandler;
     private Tab mMainTab;
     private CustomTabBottomBarDelegate mBottomBarDelegate;
 
     // This is to give the right package name while using the client's resources during an
     // overridePendingTransition call.
     // TODO(ianwen, yusufo): Figure out a solution to extract external resources without having to
     // change the package name.
     private boolean mShouldOverridePackage;
 
-    private boolean mRecordedStartupUma;
     private boolean mHasCreatedTabEarly;
     private boolean mIsInitialStart = true;
     private boolean mHasPrerender;
     private CustomTabObserver mTabObserver;
 
     private String mPrerenderedUrl;
     private boolean mHasPrerendered;
 
     // Only the normal tab model is observed because there is no icognito tabmodel in Custom Tabs.
     private TabModelObserver mTabModelObserver = new EmptyTabModelObserver() {
@@ skipping 314 matching lines @@
                         "CustomTabs.ServiceClient.PackageName", packageName);
             }
         });
     }
 
     @Override
     public void onStartWithNative() {
         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;
     }
 
     @Override
     public void onPauseWithNative() {
         super.onPauseWithNative();
         CustomTabsConnection.getInstance(getApplication()).notifyNavigationEvent(
                 mSession, CustomTabsCallback.TAB_HIDDEN);
@@ skipping 355 matching lines @@
      *         overridden if the Data Reduction Proxy is using Lo-Fi previews.
      */
     private String getUrlToLoad() {
         String url = IntentHandler.getUrlFromIntent(getIntent());
         if (!TextUtils.isEmpty(url)) {
             url = DataReductionProxySettings.getInstance().maybeRewriteWebliteUrl(url);
         }
         return url;
     }
 }