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

Unified Diff: base/debug/trace_event_unittest.cc

Issue 19795004: Merge 212415 "reland of http://crrev.com/212230 Create top-level..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1569/src/
Patch Set: Created 7 years, 5 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
« no previous file with comments | « base/debug/trace_event_impl.cc ('k') | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/debug/trace_event_unittest.cc
===================================================================
--- base/debug/trace_event_unittest.cc (revision 212608)
+++ base/debug/trace_event_unittest.cc (working copy)
@@ -1677,8 +1677,6 @@
"record-continuously,enable-sampling"));
}
-// Not supported in split dll build. http://crbug.com/256965
-#if !defined(CHROME_SPLIT_DLL)
TEST_F(TraceEventTestFixture, TraceSampling) {
event_watch_notification_ = 0;
TraceLog::GetInstance()->SetEnabled(
@@ -1738,7 +1736,6 @@
EndTraceAndFlush();
}
-#endif // !CHROME_SPLIT_DLL
class MyData : public base::debug::ConvertableToTraceFormat {
public:
« no previous file with comments | « base/debug/trace_event_impl.cc ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698