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

webkit/tools/test_shell/simple_file_system.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 WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_
 #define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_
 
-#include <vector>
 #include "base/file_util_proxy.h"
 #include "base/id_map.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/memory/weak_ptr.h"
+#include "base/scoped_temp_dir.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h"
 #include "webkit/fileapi/file_system_types.h"
+#include <vector>
 
 namespace WebKit {
 class WebFileSystemCallbacks;
 class WebFrame;
 }
 
 namespace fileapi {
 class FileSystemContext;
 class FileSystemOperation;
 }
@@ skipping 50 matching lines @@
 
   // A temporary directory for FileSystem API.
   ScopedTempDir file_system_dir_;
 
   scoped_refptr<fileapi::FileSystemContext> file_system_context_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleFileSystem);
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_