Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / common / service_process_util_win.cc

diff --git a/src/chrome/common/service_process_util_win.cc b/src/chrome/common/service_process_util_win.cc
index badbb18..6800353 100644 (file)
--- a/src/chrome/common/service_process_util_win.cc
+++ b/src/chrome/common/service_process_util_win.cc
@@ -10,6 +10,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
+#include "base/profiler/scoped_tracker.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/object_watcher.h"
@@ -20,7 +21,7 @@
 
 namespace {
 
-const char* kTerminateEventSuffix = "_service_terminate_evt";
+const char kTerminateEventSuffix[] = "_service_terminate_evt";
 
 base::string16 GetServiceProcessReadyEventName() {
   return base::UTF8ToWide(
@@ -63,6 +64,11 @@ class ServiceProcessTerminateMonitor
 
   // base::ObjectWatcher::Delegate implementation.
   virtual void OnObjectSignaled(HANDLE object) {
+    // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed.
+    tracked_objects::ScopedTracker tracking_profile(
+        FROM_HERE_WITH_EXPLICIT_FUNCTION(
+            "ServiceProcessTerminateMonitor_OnObjectSignaled"));
+
     if (!terminate_task_.is_null()) {
       terminate_task_.Run();
       terminate_task_.Reset();