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

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

Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/trace_event/trace_event_memory.h" 5 #include "base/trace_event/trace_event_memory.h"
6 6
7 #include <sstream> 7 #include <sstream>
8 #include <string> 8 #include <string>
9 9
10 #include "base/trace_event/trace_event_impl.h" 10 #include "base/trace_event/trace_event_impl.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/googletest/include/gtest/gtest.h"
12 12
13 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) 13 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
14 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" 14 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
15 #endif 15 #endif
16 16
17 namespace base { 17 namespace base {
18 namespace trace_event { 18 namespace trace_event {
19 19
20 // Tests for the trace event memory tracking system. Exists as a class so it 20 // Tests for the trace event memory tracking system. Exists as a class so it
21 // can be a friend of TraceMemoryController. 21 // can be a friend of TraceMemoryController.
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 EXPECT_STREQ("null", StringFromHexAddress("0x0")); 227 EXPECT_STREQ("null", StringFromHexAddress("0x0"));
228 EXPECT_STREQ("error", StringFromHexAddress("not an address")); 228 EXPECT_STREQ("error", StringFromHexAddress("not an address"));
229 const char kHello[] = "hello"; 229 const char kHello[] = "hello";
230 std::ostringstream hex_address; 230 std::ostringstream hex_address;
231 hex_address << &kHello; 231 hex_address << &kHello;
232 EXPECT_STREQ(kHello, StringFromHexAddress(hex_address.str())); 232 EXPECT_STREQ(kHello, StringFromHexAddress(hex_address.str()));
233 } 233 }
234 234
235 } // namespace trace_event 235 } // namespace trace_event
236 } // namespace base 236 } // namespace base
OLDNEW
« no previous file with comments | « base/trace_event/trace_event_argument_unittest.cc ('k') | base/trace_event/trace_event_synthetic_delay_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698