Move some files in base to base/memory.

base/debug/trace_event.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Trace events to track application performance.  Events consist of a name
 // a type (BEGIN, END or INSTANT), a tracking id and extra string data.
 // In addition, the current process id, thread id, a timestamp down to the
 // microsecond and a file and line number of the calling location.
 //
 // The current implementation logs these events into a log file of the form
@@ skipping 13 matching lines @@
 //
 // Note that the Windows implementation is always enabled, irrespective the
 // value of the CHROMIUM_ENABLE_TRACE_EVENT define. The Windows implementation
 // is controlled by Event Tracing for Windows, which will turn tracing on only
 // if there is someone listening for the events it generates.
 #include "base/debug/trace_event_win.h"
 #else  // defined(OS_WIN)
 
 #include <string>
 
-#include "base/scoped_ptr.h"
-#include "base/singleton.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "base/timer.h"
 
 #ifndef CHROMIUM_ENABLE_TRACE_EVENT
 #define TRACE_EVENT_BEGIN(name, id, extra) ((void) 0)
 #define TRACE_EVENT_END(name, id, extra) ((void) 0)
 #define TRACE_EVENT_INSTANT(name, id, extra) ((void) 0)
 
 #else  // CHROMIUM_ENABLE_TRACE_EVENT
@@ skipping 94 matching lines @@
   scoped_ptr<base::ProcessMetrics> process_metrics_;
   RepeatingTimer<TraceLog> timer_;
 };
 
 }  // namespace debug
 }  // namespace base
 
 #endif  // defined(OS_WIN)
 
 #endif  // BASE_DEBUG_TRACE_EVENT_H_