[Sync Promo UI] Change data reporting to differentiate between startup and other

chrome/browser/ui/webui/sync_promo/sync_promo_trial.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/string_util.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "grit/generated_resources.h"
 
 namespace sync_promo_trial {
 
 // Field trial IDs of the control and experiment groups. Though they are not
 // literally "const", they are set only once, in Activate() below. See the .h
 // file for what these groups represent.
 int g_sync_promo_experiment_a = 0;
 int g_sync_promo_experiment_b = 0;
 int g_sync_promo_experiment_c = 0;
@@ skipping 111 matching lines @@
   return IDS_SYNC_PROMO_MESSAGE_BODY_A;
 }
 
 void RecordUserSawMessage() {
   DCHECK(IsExperimentActive());
   UMA_HISTOGRAM_ENUMERATION("SyncPromo.MessageDisplayed",
                             GetGroup(),
                             PROMO_MSG_MAX);
 }
 
-void RecordUserShownPromoWithTrialBrand() {
+void RecordUserShownPromoWithTrialBrand(bool is_at_startup, Profile* profile) {
   DCHECK(IsPartOfBrandTrialToEnable());
-  UMA_HISTOGRAM_ENUMERATION("SyncPromo.ShownPromoWithBrand",
-                            GetSyncPromoBrandUMABucketFromGroup(),
-                            SYNC_PROMO_AND_DEFAULT_APPS_BOUNDARY);
+  if (is_at_startup) {
+    DCHECK(SyncPromoUI::HasShownPromoAtStartup(profile));
+    UMA_HISTOGRAM_ENUMERATION("SyncPromo.ShownPromoWithBrandAtStartup",
+                              GetSyncPromoBrandUMABucketFromGroup(),
+                              SYNC_PROMO_AND_DEFAULT_APPS_BOUNDARY);
+  } else {
+    UMA_HISTOGRAM_ENUMERATION("SyncPromo.ShownPromoWithBrand",
+                              GetSyncPromoBrandUMABucketFromGroup(),
+                              SYNC_PROMO_AND_DEFAULT_APPS_BOUNDARY);
+  }
 }
 
 void RecordUserSignedIn() {
   DCHECK(IsExperimentActive());
   UMA_HISTOGRAM_ENUMERATION("SyncPromo.MessageOnSignIn",
                             GetGroup(),
                             PROMO_MSG_MAX);
 }
 
-void RecordUserSignedInWithTrialBrand() {
+void RecordUserSignedInWithTrialBrand(bool is_at_startup, Profile* profile) {
   DCHECK(IsPartOfBrandTrialToEnable());
-  UMA_HISTOGRAM_ENUMERATION("SyncPromo.SignedInWithBrand",
-                            GetSyncPromoBrandUMABucketFromGroup(),
-                            SYNC_PROMO_AND_DEFAULT_APPS_BOUNDARY);
+  if (is_at_startup) {
+    DCHECK(SyncPromoUI::HasShownPromoAtStartup(profile));
+    UMA_HISTOGRAM_ENUMERATION("SyncPromo.SignedInWithBrandAtStartup",
+                              GetSyncPromoBrandUMABucketFromGroup(),
+                              SYNC_PROMO_AND_DEFAULT_APPS_BOUNDARY);
+  } else {
+    UMA_HISTOGRAM_ENUMERATION("SyncPromo.SignedInWithBrand",
+                              GetSyncPromoBrandUMABucketFromGroup(),
+                              SYNC_PROMO_AND_DEFAULT_APPS_BOUNDARY);
+  }
 }
 
 bool ShouldShowAtStartupBasedOnBrand() {
   DCHECK(IsPartOfBrandTrialToEnable());
   std::string name =
       base::FieldTrialList::Find(kSyncPromoEnabledTrialName)->group_name();
   return name == kSyncPromoEnabledWithApps ||
          name == kSyncPromoEnabledWithoutApps;
 }
 
 }  // namespace sync_promo_trial