Added collecting of data to be fed to the JTL interpreter.

chrome/browser/profile_resetter/automatic_profile_resetter.h

Index: chrome/browser/profile_resetter/automatic_profile_resetter.h
diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter.h b/chrome/browser/profile_resetter/automatic_profile_resetter.h
index 8dc9176d82c3b6f9915353fcf4c2de61d41b55fa..a73b2a0afebbf922db42cc4e2b13d1fe963cb909 100644
--- a/chrome/browser/profile_resetter/automatic_profile_resetter.h
+++ b/chrome/browser/profile_resetter/automatic_profile_resetter.h
@@ -15,23 +15,9 @@
 #include "chrome/browser/profile_resetter/automatic_profile_resetter_mementos.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 
+class AutomaticProfileResetterDelegate;
 class Profile;
 
-// Defines the interface for the delegate that will actually show the prompt
-// and/or report statistics on behalf of the AutomaticProfileResetter.
-// The primary reason for this separation is to facilitate unit testing.
-class AutomaticProfileResetterDelegate {
- public:
-  virtual ~AutomaticProfileResetterDelegate() {}
-
-  // Triggers showing the one-time profile settings reset prompt.
-  virtual void ShowPrompt() = 0;
-
-  // Reports the given metrics through UMA.
-  virtual void ReportStatistics(uint32 satisfied_criteria_mask,
-                                uint32 combined_status_mask) = 0;
-};
-
 // This service becomes busy shortly after start-up, and is responsible for
 // evaluating if the criteria for showing the one-time profile reset prompt
 // are satisfied, and will potentially trigger the prompt, but only a single
@@ -39,20 +25,33 @@ class AutomaticProfileResetterDelegate {
 // "mementos"). All methods in this class shall be called on the UI thread.

[vasilii, 2013/10/14 16:43:33]

What is "mementos"?

[engedy, 2013/10/14 19:35:50]

Added reference to where they are explained.

 class AutomaticProfileResetter : public BrowserContextKeyedService {
  public:
+  // Number of bits, and maximum value (exclusive) for the mask whose bits
+  // indicate which of reset criteria were satisfied.
+  static const size_t kSatisfiedCriteriaMaskBits;

[vasilii, 2013/10/14 16:43:33]

kSatisfiedCriteriaMaskBitsCount or something.
I also find strange that the mask is uint32 and the number of bits is size_t
which is bigger.

[engedy, 2013/10/14 19:35:50]

Done.
I agree that this is strange, I am not sure what we can do against this. The
style guide is pretty strict in this matter.

[vasilii, 2013/10/16 13:39:48]

Does it say something about kCombinedStatusMaskBits type?

[engedy, 2013/10/16 15:12:17]

As discussed, we will keep the size_t, as this is used in the sense of being an
array size.

+  static const uint32 kSatisfiedCriteriaMaskMaximumValue;
+
+  // Number of bits, and maximum value (exclusive) for the mask whose bits
+  // indicate if any of reset criteria were satisfied, and which of the mementos
+  // were already present.
+  static const size_t kCombinedStatusMaskBits;
+  static const uint32 kCombinedStatusMaskMaximumValue;
+
   explicit AutomaticProfileResetter(Profile* profile);
   virtual ~AutomaticProfileResetter();
 
-  // Initializes the service, and sets up the asynchronous evaluation flow.
-  // Called by AutomaticProfileResetterFactory.
-  void Initialize();
+  // Fires up the service by unleashing the asynchronous evaluation flow, unless
+  // the service has been already disabled in Initialize() or there is no
+  // |program_| to run (in which case the service also gets disabled).
+  // Called by the AutomaticProfileResetterFactory.
+  void Activate();
 
-  // Should be called after Initialize().
+  // Should be called before Activate().
   void SetHashSeedForTesting(const base::StringPiece& hash_seed);
 
-  // Should be called after Initialize().
+  // Should be called before Activate().
   void SetProgramForTesting(const base::StringPiece& program);
 
-  // Should be called after Initialize(). Takes ownership.
+  // Should be called before Activate(). Takes ownership.
   void SetDelegateForTesting(AutomaticProfileResetterDelegate* delegate);
 
  private:
@@ -60,18 +59,31 @@ class AutomaticProfileResetter : public BrowserContextKeyedService {
 
   enum State {
     STATE_UNINITIALIZED,
+    STATE_INITIALIZED,
     STATE_DISABLED,
+    STATE_WAITING_ON_SERVICES,
     STATE_READY,
     STATE_WORKING,
     STATE_DONE
   };
 
+  // Initializes the service if it is enabled in the field trial, otherwise,
+  // skips the initialization steps and also permanently disables the service.
+  void Initialize();
+
   // Returns whether or not a dry-run shall be performed.
   bool ShouldPerformDryRun() const;

[vasilii, 2013/10/14 16:43:33]

Those two method shouldn't be in the header. They can reside in the anonymous
namespace.

[engedy, 2013/10/14 19:35:50]

Done.

 
   // Returns whether or not a live-run shall be performed.
   bool ShouldPerformLiveRun() const;
 
+  // Called back by |resetter_delegate_| when the template URL service is ready.
+  void OnTemplateURLServiceBecameReady();
+
+  // Called back by |resetter_delegate_| when the loaded modules have been
+  // enumerated.
+  void OnEnumerationOfLoadedModulesReady();
+
   // Begins the asynchronous evaluation flow, which will assess whether the
   // criteria for showing the reset prompt are met, whether we have already
   // shown the prompt, and, in the end, will potentially trigger the prompt.
@@ -109,6 +121,8 @@ class AutomaticProfileResetter : public BrowserContextKeyedService {
   Profile* profile_;
 
   State state_;
+  bool enumeration_of_loaded_modules_ready_;
+  bool template_url_service_ready_;
 
   base::StringPiece hash_seed_;
   base::StringPiece program_;