Merge 114608, 115692 to 963 (M17) branch.

chrome/browser/ui/webui/sync_promo/sync_promo_handler.h

Index: chrome/browser/ui/webui/sync_promo/sync_promo_handler.h
diff --git a/chrome/browser/ui/webui/sync_promo_handler.h b/chrome/browser/ui/webui/sync_promo/sync_promo_handler.h
similarity index 89%
rename from chrome/browser/ui/webui/sync_promo_handler.h
rename to chrome/browser/ui/webui/sync_promo/sync_promo_handler.h
index d0534e45dec32563a870c9e67550ea0a0a50101b..c1f4737511887b0b6bded1a2a5b41e485e9d263d 100644
--- a/chrome/browser/ui/webui/sync_promo_handler.h
+++ b/chrome/browser/ui/webui/sync_promo/sync_promo_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_SYNC_PROMO_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_SYNC_PROMO_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/ui/webui/sync_setup_handler.h"
@@ -70,14 +70,15 @@ class SyncPromoHandler : public SyncSetupHandler {
 
   // Increment the local view count by the specified non-negative integer
   // amount. Returns the new total view count.
-  int IncrementViewCountBy(unsigned int amount);
+  int IncrementViewCountBy(size_t amount);
+
+  // Record the outcome of the sync promo experiment (currently if the user
+  // signs in to sync or not).
+  void RecordExperimentOutcomesOnSignIn();
 
   // Record a user's flow through the promo to our histogram in UMA.
   void RecordUserFlowAction(int action);
 
-  // Load any experiments that run on the promo page.
-  void LoadPromoExperiments();
-
   // Use this to register for certain notifications (currently when tabs or
   // windows close).
   content::NotificationRegistrar registrar_;
@@ -94,4 +95,4 @@ class SyncPromoHandler : public SyncSetupHandler {
   DISALLOW_COPY_AND_ASSIGN(SyncPromoHandler);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_SYNC_PROMO_HANDLER_H_