Merge 114608, 115692 to 963 (M17) branch.

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

 // 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.
 
-#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"
 
 class PrefService;
 
 // The handler for JavaScript messages related to the "sync promo" page.
 class SyncPromoHandler : public SyncSetupHandler {
  public:
   explicit SyncPromoHandler(ProfileManager* profile_manager);
@@ skipping 46 matching lines @@
 
   // JavaScript callback handler for when a user clicks skip.
   void HandleUserSkipped(const base::ListValue* args);
 
   // Return the number of times the user with the current profile has seen the
   // sync promo.
   int GetViewCount() const;
 
   // 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_;
 
   // Weak reference that's initialized and checked in Attach() (after that
   // guaranteed to be non-NULL).
   PrefService* prefs_;
 
   // If the user closes the whole window we'll get a close notification from the
   // tab as well, so this bool acts as a small mutex to only report the close
   // method once.
   bool window_already_closed_;
 
   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_