[Sync Promo UI] Changing sync promo to honor brand codes.

chrome/browser/ui/webui/sync_promo/sync_promo_handler2.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_handler2.h"
+#include "chrome/browser/ui/webui/sync_promo/sync_promo_handler2.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/webui/sync_promo_trial.h"
-#include "chrome/browser/ui/webui/sync_promo_ui.h"
+#include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
+#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 
 namespace {
 
@@ skipping 20 matching lines @@
 
 // This was added because of the need to change the existing UMA enum for the
 // sync promo mid-flight. Ideally these values would be contiguous, but the
 // real world is not always ideal.
 static bool IsValidUserFlowAction(int action) {
   return (action >= SYNC_PROMO_FIRST_VALID_JS_ACTION &&
           action <= SYNC_PROMO_LAST_VALID_JS_ACTION) ||
          action == SYNC_PROMO_LEFT_DURING_THROBBER;
 }
 
+static void RecordExperimentOutcomesOnSignIn() {
+  if (sync_promo_trial::IsExperimentActive())
+    sync_promo_trial::RecordUserSignedIn();
+  if (sync_promo_trial::IsPartOfBrandTrialToEnable())
+    sync_promo_trial::RecordUserSignedInWithTrialBrand();
+}
+
 }  // namespace
 
 SyncPromoHandler2::SyncPromoHandler2(ProfileManager* profile_manager)
     : SyncSetupHandler2(profile_manager),
       window_already_closed_(false) {
 }
 
 SyncPromoHandler2::~SyncPromoHandler2() {
 }
 
@@ skipping 45 matching lines @@
   web_ui_->RegisterMessageCallback("SyncPromo:UserFlowAction",
       base::Bind(&SyncPromoHandler2::HandleUserFlowAction,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("SyncPromo:UserSkipped",
       base::Bind(&SyncPromoHandler2::HandleUserSkipped,
                  base::Unretained(this)));
   SyncSetupHandler2::RegisterMessages();
 }
 
 void SyncPromoHandler2::ShowGaiaSuccessAndClose() {
-  if (sync_promo_trial::IsExperimentActive())
-    sync_promo_trial::RecordUserSignedIn();
-
+  RecordExperimentOutcomesOnSignIn();
   SyncSetupHandler2::ShowGaiaSuccessAndClose();
 }
 
 void SyncPromoHandler2::ShowGaiaSuccessAndSettingUp() {
-  if (sync_promo_trial::IsExperimentActive())
-    sync_promo_trial::RecordUserSignedIn();
-
+  RecordExperimentOutcomesOnSignIn();
   SyncSetupHandler2::ShowGaiaSuccessAndSettingUp();
 }
 
 void SyncPromoHandler2::ShowConfigure(const base::DictionaryValue& args) {
   bool usePassphrase = false;
   args.GetBoolean("usePassphrase", &usePassphrase);
 
   if (usePassphrase) {
     // If a passphrase is required then we must show the configure pane.
     SyncSetupHandler2::ShowConfigure(args);
@@ skipping 94 matching lines @@
 
 // TODO(dbeam): Replace with metricsHandler:recordHistogramTime when it exists.
 void SyncPromoHandler2::HandleRecordThrobberTime(const base::ListValue* args) {
   double time_double;
   CHECK(args->GetDouble(0, &time_double));
   UMA_HISTOGRAM_TIMES("SyncPromo.ThrobberTime",
                       base::TimeDelta::FromMilliseconds(time_double));
 }
 
 // TODO(dbeam): Replace with metricsHandler:recordHistogramCount when it exists.
-void SyncPromoHandler2::HandleRecordSignInAttempts(const base::ListValue* args) {
+void SyncPromoHandler2::HandleRecordSignInAttempts(
+    const base::ListValue* args) {
   double count_double;
   CHECK(args->GetDouble(0, &count_double));
   UMA_HISTOGRAM_COUNTS("SyncPromo.SignInAttempts", count_double);
 }
 
 void SyncPromoHandler2::HandleUserFlowAction(const base::ListValue* args) {
   double action_double;
   CHECK(args->GetDouble(0, &action_double));
   int action = static_cast<int>(action_double);
 
   if (IsValidUserFlowAction(action))
     RecordUserFlowAction(action);
   else
     NOTREACHED() << "Attempt to record invalid user flow action on sync promo.";
 }
 
 void SyncPromoHandler2::HandleUserSkipped(const base::ListValue* args) {
   SyncPromoUI::SetUserSkippedSyncPromo(Profile::FromWebUI(web_ui_));
   RecordUserFlowAction(SYNC_PROMO_SKIP_CLICKED);
 }
 
 int SyncPromoHandler2::GetViewCount() const {
   // The locally persistent number of times the user has seen the sync promo.
   return prefs_->GetInteger(prefs::kSyncPromoViewCount);
 }
 
-int SyncPromoHandler2::IncrementViewCountBy(unsigned int amount) {
+int SyncPromoHandler2::IncrementViewCountBy(size_t amount) {
   // Let the user increment by 0 if they really want.  It might be useful for a
   // weird way of sending preference change notifications...
   int adjusted = GetViewCount() + amount;
   prefs_->SetInteger(prefs::kSyncPromoViewCount, adjusted);
   return adjusted;
 }
 
 void SyncPromoHandler2::RecordUserFlowAction(int action) {
   // Send an enumeration to our single user flow histogram.
   UMA_HISTOGRAM_ENUMERATION("SyncPromo.UserFlow", action,
                             SYNC_PROMO_BUCKET_BOUNDARY);
 }