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

base/scoped_temp_dir.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_TEMP_DIR_H_
-#define BASE_MEMORY_SCOPED_TEMP_DIR_H_
+#ifndef BASE_SCOPED_TEMP_DIR_H_
+#define BASE_SCOPED_TEMP_DIR_H_
 #pragma once
 
 // An object representing a temporary / scratch directory that should be cleaned
 // up (recursively) when this object goes out of scope.  Note that since
 // deletion occurs during the destructor, no further error handling is possible
 // if the directory fails to be deleted.  As a result, deletion is not
 // guaranteed by this class.
 //
 // Multiple calls to the methods which establish a temporary directory
 // (CreateUniqueTempDir, CreateUniqueTempDirUnderPath, and Set) must have
@@ skipping 32 matching lines @@
 
   // Returns true if path_ is non-empty and exists.
   bool IsValid() const;
 
  private:
   FilePath path_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedTempDir);
 };
 
-#endif  // BASE_MEMORY_SCOPED_TEMP_DIR_H_
+#endif  // BASE_SCOPED_TEMP_DIR_H_