Move some files in base to base/memory.

base/memory/scoped_callback_factory.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.
 
 // ScopedCallbackFactory helps in cases where you wish to allocate a Callback
 // (see base/callback.h), but need to prevent any pending callbacks from
 // executing when your object gets destroyed.
 //
 // EXAMPLE:
 //
@@ skipping 15 matching lines @@
 //
 //    base::ScopedCallbackFactory<MyClass> factory_;
 //  };
 //
 // In the above example, the Process function calls GatherDataAsynchronously to
 // kick off some asynchronous processing that upon completion will notify a
 // callback.  If in the meantime, the MyClass instance is destroyed, when the
 // 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 {
 
 template <class T>
 class ScopedCallbackFactory {
  public:
   explicit ScopedCallbackFactory(T* obj) : weak_factory_(obj) {
   }
 
   typename Callback0::Type* NewCallback(
@@ skipping 72 matching lines @@
         return;
       DispatchToMethod(this->obj_.get(), this->meth_, params);
     }
   };
 
   WeakPtrFactory<T> weak_factory_;
 };
 
 }  // namespace base
 
-#endif  // BASE_SCOPED_CALLBACK_FACTORY_H_
+#endif  // BASE_MEMORY_SCOPED_CALLBACK_FACTORY_H_