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

chrome/common/extensions/extension_unpacker.cc

 // 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 "chrome/common/extensions/extension_unpacker.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_handle.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "net/base/file_stream.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/zip.h"
 #include "content/common/common_param_traits.h"
 #include "content/common/json_value_serializer.h"
 #include "ipc/ipc_message_utils.h"
+#include "net/base/file_stream.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/image_decoder.h"
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 namespace filenames = extension_filenames;
 
 namespace {
 
 // Errors
@@ skipping 280 matching lines @@
     return false;
   }
   parsed_catalogs_->Set(dir_name, root.release());
 
   return true;
 }
 
 void ExtensionUnpacker::SetError(const std::string &error) {
   error_message_ = error;
 }