components/policy/core/common/policy_loader_win.cc - Issue 686963002: Switching profiler instrumentations from ScopedProfile to ScopedTracker

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/policy/core/common/policy_loader_win.cc

Issue 686963002: Switching profiler instrumentations from ScopedProfile to ScopedTracker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/policy/core/common/cloud/device_management_service.cc ('k') | components/search_engines/template_url_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/core/common/policy_loader_win.cc

diff --git a/components/policy/core/common/policy_loader_win.cc b/components/policy/core/common/policy_loader_win.cc

index b2316ddb5495ee1968272a654f1a06e14300b1b1..69320dbc052072dc0d7db25b974d1efacd5da4af 100644

--- a/components/policy/core/common/policy_loader_win.cc

+++ b/components/policy/core/common/policy_loader_win.cc

@@ -31,7 +31,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/metrics/histogram.h"

#include "base/metrics/sparse_histogram.h"

-#include "base/profiler/scoped_profile.h"

+#include "base/profiler/scoped_tracker.h"

#include "base/scoped_native_library.h"

#include "base/sequenced_task_runner.h"

#include "base/stl_util.h"

@@ -681,10 +681,9 @@ void PolicyLoaderWin::SetupWatches() {

}

void PolicyLoaderWin::OnObjectSignaled(HANDLE object) {

- // TODO(vadimt): Remove ScopedProfile below once crbug.com/418183 is fixed.

- tracked_objects::ScopedProfile tracking_profile(

- FROM_HERE_WITH_EXPLICIT_FUNCTION(

- "PolicyLoaderWin_OnObjectSignaled"));

+ // 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())