Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1213)

Unified Diff: chrome_frame/chrome_frame_automation.cc

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: shared dll build, phishing test shutdown crashes, tsan warnings; merge 84612 Created 9 years, 7 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
Index: chrome_frame/chrome_frame_automation.cc
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 60249720056f84a08f0c9e88feaab0f0db3937ca..f0ccbe465b651b43d44abc143a9f29a8eee6b90c 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -129,7 +129,7 @@ ChromeFrameAutomationProxyImpl::ChromeFrameAutomationProxyImpl(
AutomationProxyCacheEntry* entry,
std::string channel_id, int launch_timeout)
: AutomationProxy(launch_timeout, false), proxy_entry_(entry) {
- TRACE_EVENT_BEGIN("chromeframe.automationproxy", this, "");
+ TRACE_EVENT_BEGIN_ETW("chromeframe.automationproxy", this, "");
InitializeChannel(channel_id, false);
@@ -142,7 +142,7 @@ ChromeFrameAutomationProxyImpl::ChromeFrameAutomationProxyImpl(
}
ChromeFrameAutomationProxyImpl::~ChromeFrameAutomationProxyImpl() {
- TRACE_EVENT_END("chromeframe.automationproxy", this, "");
+ TRACE_EVENT_END_ETW("chromeframe.automationproxy", this, "");
}
void ChromeFrameAutomationProxyImpl::SendAsAsync(
@@ -354,7 +354,7 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params,
AUTOMATION_CREATE_TAB_FAILED + 1);
}
- TRACE_EVENT_END("chromeframe.createproxy", this, "");
+ TRACE_EVENT_END_ETW("chromeframe.createproxy", this, "");
// Finally set the proxy.
proxy_.reset(proxy);
@@ -467,7 +467,7 @@ ProxyFactory::~ProxyFactory() {
void ProxyFactory::GetAutomationServer(
LaunchDelegate* delegate, ChromeFrameLaunchParams* params,
void** automation_server_id) {
- TRACE_EVENT_BEGIN("chromeframe.createproxy", this, "");
+ TRACE_EVENT_BEGIN_ETW("chromeframe.createproxy", this, "");
scoped_refptr<AutomationProxyCacheEntry> entry;
// Find already existing launcher thread for given profile

Powered by Google App Engine
This is Rietveld 408576698