Move scoped_temp_dir and scoped_native_library back from base/memory to base.

base/scoped_native_library.cc

 // Copyright (c) 2011 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.
 
-#include "base/memory/scoped_native_library.h"
+#include "base/scoped_native_library.h"
 
 namespace base {
 
 ScopedNativeLibrary::ScopedNativeLibrary() : library_(NULL) {
 }
 
 ScopedNativeLibrary::ScopedNativeLibrary(NativeLibrary library)
     : library_(library) {
 }
 
@@ skipping 19 matching lines @@
   library_ = library;
 }
 
 NativeLibrary ScopedNativeLibrary::Release() {
   NativeLibrary result = library_;
   library_ = NULL;
   return result;
 }
 
 }  // namespace base