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

Side by Side Diff: trunk/src/content/browser/tracing/trace_subscriber_stdio_unittest.cc

Issue 89753004: Revert 237280 "Remove TraceController" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/tracing/trace_subscriber_stdio.h" 5 #include "content/browser/tracing/trace_subscriber_stdio.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/threading/sequenced_worker_pool.h" 9 #include "base/threading/sequenced_worker_pool.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 BrowserThread::GetBlockingPool()->FlushForTesting(); 123 BrowserThread::GetBlockingPool()->FlushForTesting();
124 std::string result; 124 std::string result;
125 EXPECT_TRUE(base::ReadFileToString(trace_file, &result)); 125 EXPECT_TRUE(base::ReadFileToString(trace_file, &result));
126 EXPECT_EQ( 126 EXPECT_EQ(
127 "{\"traceEvents\":[foo,bar],\"" 127 "{\"traceEvents\":[foo,bar],\""
128 "systemTraceEvents\":\"event1\\nev\\\"ent\\\"2\\n\"}", 128 "systemTraceEvents\":\"event1\\nev\\\"ent\\\"2\\n\"}",
129 result); 129 result);
130 } 130 }
131 131
132 } // namespace content 132 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698