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

chrome/browser/extensions/convert_user_script.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/browser/extensions/convert_user_script.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
-#include "crypto/sha2.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/common/chrome_paths.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/user_script.h"
 #include "content/common/json_value_serializer.h"
+#include "crypto/sha2.h"
 #include "googleurl/src/gurl.h"
 
 namespace keys = extension_manifest_keys;
 namespace values = extension_manifest_values;
 
 scoped_refptr<Extension> ConvertUserScriptToExtension(
     const FilePath& user_script_path, const GURL& original_url,
     std::string* error) {
   std::string content;
   if (!file_util::ReadFileToString(user_script_path, &content)) {
@@ skipping 128 matching lines @@
       Extension::NO_FLAGS,
       error);
   if (!extension) {
     NOTREACHED() << "Could not init extension " << *error;
     return NULL;
   }
 
   temp_dir.Take();  // The caller takes ownership of the directory.
   return extension;
 }