Index: base/trace_event/process_memory_maps_dump_provider.h |
diff --git a/base/trace_event/process_memory_maps_dump_provider.h b/base/trace_event/process_memory_maps_dump_provider.h |
index 5a0f84cbb66e0122615b13ccedb031da8fb13fb8..93d94474c6bb9f641612c13a95b6c2fc2d4ac5ce 100644 |
--- a/base/trace_event/process_memory_maps_dump_provider.h |
+++ b/base/trace_event/process_memory_maps_dump_provider.h |
@@ -5,8 +5,7 @@ |
#ifndef BASE_TRACE_EVENT_PROCESS_MEMORY_MAPS_DUMP_PROVIDER_H_ |
#define BASE_TRACE_EVENT_PROCESS_MEMORY_MAPS_DUMP_PROVIDER_H_ |
-#include <istream> |
- |
+#include "base/files/scoped_file.h" |
#include "base/gtest_prod_util.h" |
#include "base/memory/singleton.h" |
#include "base/trace_event/memory_dump_provider.h" |
@@ -28,7 +27,7 @@ class BASE_EXPORT ProcessMemoryMapsDumpProvider : public MemoryDumpProvider { |
FRIEND_TEST_ALL_PREFIXES(ProcessMemoryMapsDumpProviderTest, ParseProcSmaps); |
#if defined(OS_LINUX) || defined(OS_ANDROID) |
- static std::istream* proc_smaps_for_testing; |
+ static ScopedFD* proc_smaps_for_testing; |
Primiano Tucci (use gerrit)
2015/09/10 16:52:36
I think you don't want the * here (just scopedfd)
ssid
2015/09/21 11:25:43
Hm it is static variable and scoped. It needs exit
|
#endif |
ProcessMemoryMapsDumpProvider(); |