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

base/memory/scoped_native_library.cc

Index: base/memory/scoped_native_library.cc
diff --git a/base/memory/scoped_native_library.cc b/base/memory/scoped_native_library.cc
deleted file mode 100644
index c1e6afcb44e6cdf51306008586572a2ac7aa682c..0000000000000000000000000000000000000000
--- a/base/memory/scoped_native_library.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-// 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"
-
-namespace base {
-
-ScopedNativeLibrary::ScopedNativeLibrary() : library_(NULL) {
-}
-
-ScopedNativeLibrary::ScopedNativeLibrary(NativeLibrary library)
-    : library_(library) {
-}
-
-ScopedNativeLibrary::ScopedNativeLibrary(const FilePath& library_path) {
-  library_ = base::LoadNativeLibrary(library_path, NULL);
-}
-
-ScopedNativeLibrary::~ScopedNativeLibrary() {
-  if (library_)
-    base::UnloadNativeLibrary(library_);
-}
-
-void* ScopedNativeLibrary::GetFunctionPointer(
-    const char* function_name) const {
-  if (!library_)
-    return NULL;
-  return base::GetFunctionPointerFromNativeLibrary(library_, function_name);
-}
-
-void ScopedNativeLibrary::Reset(NativeLibrary library) {
-  if (library_)
-    base::UnloadNativeLibrary(library_);
-  library_ = library;
-}
-
-NativeLibrary ScopedNativeLibrary::Release() {
-  NativeLibrary result = library_;
-  library_ = NULL;
-  return result;
-}
-
-}  // namespace base