Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / policy / core / common / policy_loader_win.cc

diff --git a/src/components/policy/core/common/policy_loader_win.cc b/src/components/policy/core/common/policy_loader_win.cc
index d26439d..69320db 100644 (file)
--- a/src/components/policy/core/common/policy_loader_win.cc
+++ b/src/components/policy/core/common/policy_loader_win.cc
@@ -31,6 +31,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
+#include "base/profiler/scoped_tracker.h"
 #include "base/scoped_native_library.h"
 #include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
@@ -291,12 +292,12 @@ class WinGPOListProvider : public AppliedGPOListProvider {
                                   LPCTSTR machine_name,
                                   PSID sid_user,
                                   GUID* extension_guid,
-                                  PGROUP_POLICY_OBJECT* gpo_list) OVERRIDE {
+                                  PGROUP_POLICY_OBJECT* gpo_list) override {
     return ::GetAppliedGPOList(flags, machine_name, sid_user, extension_guid,
                                gpo_list);
   }
 
-  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) OVERRIDE {
+  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override {
     return ::FreeGPOList(gpo_list);
   }
 };
@@ -680,6 +681,10 @@ void PolicyLoaderWin::SetupWatches() {
 }
 
 void PolicyLoaderWin::OnObjectSignaled(HANDLE object) {
+  // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed.
+  tracked_objects::ScopedTracker tracking_profile(
+      FROM_HERE_WITH_EXPLICIT_FUNCTION("PolicyLoaderWin_OnObjectSignaled"));
+
   DCHECK(object == user_policy_changed_event_.handle() ||
          object == machine_policy_changed_event_.handle())
       << "unexpected object signaled policy reload, obj = "