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

base/scoped_native_library.h

 // 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.
 
-#ifndef BASE_MEMORY_SCOPED_NATIVE_LIBRARY_H_
-#define BASE_MEMORY_SCOPED_NATIVE_LIBRARY_H_
+#ifndef BASE_SCOPED_NATIVE_LIBRARY_H_
+#define BASE_SCOPED_NATIVE_LIBRARY_H_
 #pragma once
 
 #include "base/base_api.h"
 #include "base/native_library.h"
 
 class FilePath;
 
 namespace base {
 
 // A class which encapsulates a base::NativeLibrary object available only in a
@@ skipping 26 matching lines @@
   NativeLibrary Release();
 
  private:
   NativeLibrary library_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedNativeLibrary);
 };
 
 }  // namespace base
 
-#endif  // BASE_MEMORY_SCOPED_NATIVE_LIBRARY_H_
+#endif  // BASE_MEMORY_NATIVE_LIBRARY_H_