base/trace_event/memory_dump_manager.h - Issue 1445003002: Use std::default_delete as the default deleter for scoped_ptr.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/trace_event/memory_dump_manager.h

Issue 1445003002: Use std::default_delete as the default deleter for scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix Windows 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 side-by-side diff with in-line comments

Download patch

« base/memory/scoped_ptr.h ('K') | « base/process/process_metrics_win.cc ('k') | chrome/browser/chromeos/app_mode/kiosk_app_manager.h » ('j') | chrome/browser/chromeos/app_mode/kiosk_app_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/trace_event/memory_dump_manager.h

diff --git a/base/trace_event/memory_dump_manager.h b/base/trace_event/memory_dump_manager.h

index 7f0508b4b0eddbb83c0868f3105d0a6aab098cfb..3102713e1185e0d4f3e4c068c5d4baf186f1f3a0 100644

--- a/base/trace_event/memory_dump_manager.h

+++ b/base/trace_event/memory_dump_manager.h

@@ -5,6 +5,7 @@

#ifndef BASE_TRACE_EVENT_MEMORY_DUMP_MANAGER_H_

#define BASE_TRACE_EVENT_MEMORY_DUMP_MANAGER_H_

+#include <memory>

#include <set>

#include "base/atomicops.h"

@@ -124,7 +125,7 @@ class BASE_EXPORT MemoryDumpManager : public TraceLog::EnabledStateObserver {

}

private:

- friend struct DefaultDeleter<MemoryDumpManager>; // For the testing instance.

+ friend std::default_delete<MemoryDumpManager>; // For the testing instance.

dcheng 2015/11/16 18:22:59 This is a C++11-ism. Do we want to stick with: fri

danakj 2015/11/16 22:19:02 Seems ok if the bots work. I have some vague memor

friend struct DefaultSingletonTraits<MemoryDumpManager>;

friend class MemoryDumpManagerDelegate;

friend class MemoryDumpManagerTest;