Move some files in base to base/memory.

base/memory/scoped_callback_factory.h

Index: base/memory/scoped_callback_factory.h
diff --git a/base/scoped_callback_factory.h b/base/memory/scoped_callback_factory.h
similarity index 95%
rename from base/scoped_callback_factory.h
rename to base/memory/scoped_callback_factory.h
index a2fc1f065468f4ffca763b82500f3167b23a8a78..815e67cded19fd9b64814b7bb913d88a82313540 100644
--- a/base/scoped_callback_factory.h
+++ b/base/memory/scoped_callback_factory.h
@@ -33,11 +33,11 @@
 // callback runs, it will notice that the MyClass instance is dead, and it will
 // avoid calling the GotData method.
 
-#ifndef BASE_SCOPED_CALLBACK_FACTORY_H_
-#define BASE_SCOPED_CALLBACK_FACTORY_H_
+#ifndef BASE_MEMORY_SCOPED_CALLBACK_FACTORY_H_
+#define BASE_MEMORY_SCOPED_CALLBACK_FACTORY_H_
 
 #include "base/callback.h"
-#include "base/weak_ptr.h"
+#include "base/memory/weak_ptr.h"
 
 namespace base {
 
@@ -130,4 +130,4 @@ class ScopedCallbackFactory {
 
 }  // namespace base
 
-#endif  // BASE_SCOPED_CALLBACK_FACTORY_H_
+#endif  // BASE_MEMORY_SCOPED_CALLBACK_FACTORY_H_