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

Unified Diff: base/trace_event/trace_event_unittest.cc

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo Created 5 years, 11 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/trace_event/trace_event_system_stats_monitor_unittest.cc ('k') | base/trace_event/trace_event_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/trace_event/trace_event_unittest.cc
diff --git a/base/debug/trace_event_unittest.cc b/base/trace_event/trace_event_unittest.cc
similarity index 99%
rename from base/debug/trace_event_unittest.cc
rename to base/trace_event/trace_event_unittest.cc
index 30ad797e060d96f023da990d15bb6c228a42b5d4..47b5ab619437258243c229834ec67734da6d0bba 100644
--- a/base/debug/trace_event_unittest.cc
+++ b/base/trace_event/trace_event_unittest.cc
@@ -2,15 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/debug/trace_event_unittest.h"
-
#include <math.h>
#include <cstdlib>
#include "base/bind.h"
#include "base/command_line.h"
-#include "base/debug/trace_event.h"
-#include "base/debug/trace_event_synthetic_delay.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/memory/ref_counted_memory.h"
@@ -22,6 +18,8 @@
#include "base/threading/platform_thread.h"
#include "base/threading/thread.h"
#include "base/time/time.h"
+#include "base/trace_event/trace_event.h"
+#include "base/trace_event/trace_event_synthetic_delay.h"
#include "base/values.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -871,13 +869,6 @@ void ValidateInstantEventPresentOnEveryThread(const ListValue& trace_parsed,
} // namespace
-void HighResSleepForTraceTest(base::TimeDelta elapsed) {
- base::TimeTicks end_time = base::TimeTicks::HighResNow() + elapsed;
- do {
- base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(1));
- } while (base::TimeTicks::HighResNow() < end_time);
-}
-
// Simple Test for emitting data and validating it was received.
TEST_F(TraceEventTestFixture, DataCaptured) {
TraceLog::GetInstance()->SetEnabled(
« no previous file with comments | « base/trace_event/trace_event_system_stats_monitor_unittest.cc ('k') | base/trace_event/trace_event_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698