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

chrome/installer/util/delete_tree_work_item.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 CHROME_INSTALLER_UTIL_DELETE_TREE_WORK_ITEM_H_
 #define CHROME_INSTALLER_UTIL_DELETE_TREE_WORK_ITEM_H_
 #pragma once
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #include "chrome/installer/util/work_item.h"
 
 // A WorkItem subclass that recursively deletes a file system hierarchy at the
 // given root path. The file system hierarchy could be a single file, or a
 // directory.
 // The file system hierarchy to be deleted can have one or more key files. If
 // specified, deletion will be performed only if all key files are not in use.
 class DeleteTreeWorkItem : public WorkItem {
  public:
   virtual ~DeleteTreeWorkItem();
@@ skipping 25 matching lines @@
   // Contains the temp directories for the backed-up key files. The directories
   // are created and populated in Do() as-needed. We don't use a standard
   // container for this since ScopedTempDir isn't CopyConstructible.
   scoped_array<ScopedTempDir> key_backup_paths_;
 
   // The temporary directory into which the original root_path_ has been moved.
   ScopedTempDir backup_path_;
 };
 
 #endif  // CHROME_INSTALLER_UTIL_DELETE_TREE_WORK_ITEM_H_