Separate UMA histograms for user and device policy invalidation

chrome/browser/policy/cloud/cloud_policy_invalidator.h

Index: chrome/browser/policy/cloud/cloud_policy_invalidator.h
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.h b/chrome/browser/policy/cloud/cloud_policy_invalidator.h
index ef518807a989b78a2c14da934ef287c9bc7b0410..6b581ec29d83ecc44276a6e30af3d44361d01bcc 100644
--- a/chrome/browser/policy/cloud/cloud_policy_invalidator.h
+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.h
@@ -9,6 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -56,12 +57,15 @@ class CloudPolicyInvalidator : public syncer::InvalidationHandler,
   // invalidation timestamps when determining if an invalidation is expired.
   static const int kMaxInvalidationTimeDelta;
 
+  // |handling_user_policy| indicates whether this invalidator is responsible
+  // for user policy (as opposed to device policy).
   // |core| is the cloud policy core which connects the various policy objects.
   // It must remain valid until Shutdown is called.
   // |task_runner| is used for scheduling delayed tasks. It must post tasks to
   // the main policy thread.
   // |clock| is used to get the current time.
   CloudPolicyInvalidator(
+      bool handling_user_policy,

[Joao da Silva, 2014/08/11 13:21:27]

WDYT of using enterprise_management::DeviceRegisterRequest::Type instead of a
bool?

The call site would be more obvious (new
CloudPolicyInvalidator(em::DeviceRegisterRequest::DEVICE), vs USER or BROWSER or
etc).

[bartfab (slow), 2014/08/11 14:01:59]

Done.

       CloudPolicyCore* core,
       const scoped_refptr<base::SequencedTaskRunner>& task_runner,
       scoped_ptr<base::Clock> clock);
@@ -156,6 +160,9 @@ class CloudPolicyInvalidator : public syncer::InvalidationHandler,
   };
   State state_;
 
+  // Whether this invalidator is responsible for user policy.
+  const bool handling_user_policy_;
+
   // The cloud policy core.
   CloudPolicyCore* core_;