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

Side by Side Diff: base/trace_event/trace_event_unittest.cc

Issue 837303004: Move base/debug/trace_event* to base/trace_event/ [part 1] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing merge conflicts 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 unified diff | Download patch
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 <math.h> 5 #include <math.h>
6 #include <cstdlib> 6 #include <cstdlib>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h"
11 #include "base/debug/trace_event_synthetic_delay.h"
12 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
13 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
14 #include "base/memory/ref_counted_memory.h" 12 #include "base/memory/ref_counted_memory.h"
15 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/singleton.h" 14 #include "base/memory/singleton.h"
17 #include "base/process/process_handle.h" 15 #include "base/process/process_handle.h"
18 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
19 #include "base/synchronization/waitable_event.h" 17 #include "base/synchronization/waitable_event.h"
20 #include "base/threading/platform_thread.h" 18 #include "base/threading/platform_thread.h"
21 #include "base/threading/thread.h" 19 #include "base/threading/thread.h"
22 #include "base/time/time.h" 20 #include "base/time/time.h"
21 #include "base/trace_event/trace_event.h"
22 #include "base/trace_event/trace_event_synthetic_delay.h"
23 #include "base/values.h" 23 #include "base/values.h"
24 #include "testing/gmock/include/gmock/gmock.h" 24 #include "testing/gmock/include/gmock/gmock.h"
25 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
26 26
27 namespace base { 27 namespace base {
28 namespace debug { 28 namespace debug {
29 29
30 namespace { 30 namespace {
31 31
32 enum CompareOp { 32 enum CompareOp {
(...skipping 3042 matching lines...) Expand 10 before | Expand all | Expand 10 after
3075 EXPECT_EQ(original_option.enable_sampling, new_options.enable_sampling); 3075 EXPECT_EQ(original_option.enable_sampling, new_options.enable_sampling);
3076 EXPECT_EQ(original_option.enable_systrace, new_options.enable_systrace); 3076 EXPECT_EQ(original_option.enable_systrace, new_options.enable_systrace);
3077 } 3077 }
3078 } 3078 }
3079 } 3079 }
3080 } 3080 }
3081 3081
3082 3082
3083 } // namespace debug 3083 } // namespace debug
3084 } // namespace base 3084 } // namespace base
OLDNEW
« 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