summaryrefslogtreecommitdiffstats
path: root/base/debug/trace_event_unittest.cc
diff options
context:
space:
mode:
authorhusky@chromium.org <husky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-22 23:53:00 +0000
committerhusky@chromium.org <husky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-22 23:53:00 +0000
commitecc6a5b5f2a4eda6554c1526e918cee14ba097f2 (patch)
treecc36e8d3a09055017b11c6a83b18ccd70e0c2d45 /base/debug/trace_event_unittest.cc
parent47a1f70b7eb09d7fc11f00beab94532544044ed1 (diff)
downloadchromium_src-ecc6a5b5f2a4eda6554c1526e918cee14ba097f2.zip
chromium_src-ecc6a5b5f2a4eda6554c1526e918cee14ba097f2.tar.gz
chromium_src-ecc6a5b5f2a4eda6554c1526e918cee14ba097f2.tar.bz2
Use SequencedWorkerPool for disk operations in TraceSubscriberStdio.
This class was hitting a ThreadRestrictions assert because it called OpenFile on the UI thread. To reduce unnecessary copying, I've changed the OnTraceDataCollected argument from std::string to RefCountedString. BUG=None TEST=content_unittests Review URL: http://codereview.chromium.org/9333003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug/trace_event_unittest.cc')
-rw-r--r--base/debug/trace_event_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc
index 9afd68b..befd4e8 100644
--- a/base/debug/trace_event_unittest.cc
+++ b/base/debug/trace_event_unittest.cc
@@ -42,7 +42,7 @@ class TraceEventTestFixture : public testing::Test {
// up multiple times when testing AtExit. Use ManualTestSetUp for this.
void ManualTestSetUp();
void OnTraceDataCollected(
- const scoped_refptr<TraceLog::RefCountedString>& events_str);
+ const scoped_refptr<base::RefCountedString>& events_str);
DictionaryValue* FindMatchingTraceEntry(const JsonKeyValue* key_values);
DictionaryValue* FindNamePhase(const char* name, const char* phase);
DictionaryValue* FindNamePhaseKeyValue(const char* name,
@@ -91,11 +91,11 @@ void TraceEventTestFixture::ManualTestSetUp() {
}
void TraceEventTestFixture::OnTraceDataCollected(
- const scoped_refptr<TraceLog::RefCountedString>& events_str) {
+ const scoped_refptr<base::RefCountedString>& events_str) {
AutoLock lock(lock_);
json_output_.json_output.clear();
trace_buffer_.Start();
- trace_buffer_.AddFragment(events_str->data);
+ trace_buffer_.AddFragment(events_str->data());
trace_buffer_.Finish();
scoped_ptr<Value> root;