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

Unified Diff: chrome/browser/automation/automation_provider.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/browser/automation/automation_provider.cc
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 64eef79e55bd8a40523a776080723c030cecf211..7f57e31806974a1e643105b6b9d7cccd7e1e66fc 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -111,7 +111,7 @@ AutomationProvider::AutomationProvider(Profile* profile)
is_connected_(false),
initial_tab_loads_complete_(false),
network_library_initialized_(true) {
- TRACE_EVENT_BEGIN("AutomationProvider::AutomationProvider", 0, "");
+ TRACE_EVENT_BEGIN_ETW("AutomationProvider::AutomationProvider", 0, "");
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -126,7 +126,7 @@ AutomationProvider::AutomationProvider(Profile* profile)
new ExtensionTestResultNotificationObserver(this));
g_browser_process->AddRefModule();
- TRACE_EVENT_END("AutomationProvider::AutomationProvider", 0, "");
+ TRACE_EVENT_END_ETW("AutomationProvider::AutomationProvider", 0, "");
}
AutomationProvider::~AutomationProvider() {
@@ -137,7 +137,7 @@ AutomationProvider::~AutomationProvider() {
}
bool AutomationProvider::InitializeChannel(const std::string& channel_id) {
- TRACE_EVENT_BEGIN("AutomationProvider::InitializeChannel", 0, "");
+ TRACE_EVENT_BEGIN_ETW("AutomationProvider::InitializeChannel", 0, "");
channel_id_ = channel_id;
std::string effective_channel_id = channel_id;
@@ -176,7 +176,7 @@ bool AutomationProvider::InitializeChannel(const std::string& channel_id) {
delete observer;
#endif
- TRACE_EVENT_END("AutomationProvider::InitializeChannel", 0, "");
+ TRACE_EVENT_END_ETW("AutomationProvider::InitializeChannel", 0, "");
return true;
}

Powered by Google App Engine
This is Rietveld 408576698