diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 19:49:05 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 19:49:05 +0000 |
| commit | 77eecb93841e695561c7e2c56cd07ce2c732ec7e (patch) | |
| tree | cdaaf7989a095cda13ad3624ef531b3725c583e6 /chrome_frame/chrome_frame_automation.cc | |
| parent | 7ab27064b11f3b425c66c3c51a7b0333b2baf644 (diff) | |
| download | chromium_src-77eecb93841e695561c7e2c56cd07ce2c732ec7e.zip chromium_src-77eecb93841e695561c7e2c56cd07ce2c732ec7e.tar.gz chromium_src-77eecb93841e695561c7e2c56cd07ce2c732ec7e.tar.bz2 | |
Merge gpu_trace_event back into base/debug/trace_event.
Initial land attempt at http://codereview.chromium.org/6551019/
gpu_trace_event fork at http://codereview.chromium.org/6691013
- gpu_trace_event renamed to base/debug/trace_event and modified as appropriate for base::debug
- Unit Tests implemented for trace_event
- gpu_common library removed (was added only for gpu_trace_event)
- Existing calls to trace_event suffixed with _ETW to make ETW calls (see decisions and incremental plans at end of 6551019)
- GPU trace calls renamed to new calls.
- Tracing switch removed from test_shell, as linux log file support removed.
BUG=79509
TEST=trace_event_win_unittest and about:gpu
Review URL: http://codereview.chromium.org/6862002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 6024972..f0ccbe4 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 |