diff options
| author | husky@chromium.org <husky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-24 04:17:06 +0000 |
|---|---|---|
| committer | husky@chromium.org <husky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-24 04:17:06 +0000 |
| commit | b77226e27cab2828e1638a978864442dd336a73e (patch) | |
| tree | 190bad928416e69b85b5a930dac33954b9c2fb8a /base/test | |
| parent | b07cdbcc2fd4044902f1542df9501b49c5f94786 (diff) | |
| download | chromium_src-b77226e27cab2828e1638a978864442dd336a73e.zip chromium_src-b77226e27cab2828e1638a978864442dd336a73e.tar.gz chromium_src-b77226e27cab2828e1638a978864442dd336a73e.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.
Second attempt (originally committed in 123140, reverted in 123146).
Added DISALLOW_COPY_AND_ASSIGN to fix Windows compilation error.
BUG=None
TEST=content_unittests
Review URL: http://codereview.chromium.org/9443020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test')
| -rw-r--r-- | base/test/trace_event_analyzer_unittest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/base/test/trace_event_analyzer_unittest.cc b/base/test/trace_event_analyzer_unittest.cc index ccce3f3..8ff611f 100644 --- a/base/test/trace_event_analyzer_unittest.cc +++ b/base/test/trace_event_analyzer_unittest.cc @@ -15,8 +15,7 @@ class TraceEventAnalyzerTest : public testing::Test { public: void ManualSetUp(); void OnTraceDataCollected( - const scoped_refptr<base::debug::TraceLog::RefCountedString>& - json_events_str); + const scoped_refptr<base::RefCountedString>& json_events_str); void BeginTracing(); void EndTracing(); @@ -36,9 +35,8 @@ void TraceEventAnalyzerTest::ManualSetUp() { } void TraceEventAnalyzerTest::OnTraceDataCollected( - const scoped_refptr<base::debug::TraceLog::RefCountedString>& - json_events_str) { - buffer_.AddFragment(json_events_str->data); + const scoped_refptr<base::RefCountedString>& json_events_str) { + buffer_.AddFragment(json_events_str->data()); } void TraceEventAnalyzerTest::BeginTracing() { |