Move extension unpack intermediate dir to Extensions/Temp

chrome/browser/extensions/convert_user_script.cc

 // Copyright (c) 2012 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"
@@ skipping 13 matching lines @@
 #include "crypto/sha2.h"
 #include "googleurl/src/gurl.h"
 
 namespace keys = extension_manifest_keys;
 namespace values = extension_manifest_values;
 
 namespace extensions {
 
 scoped_refptr<Extension> ConvertUserScriptToExtension(
     const FilePath& user_script_path, const GURL& original_url,
-    string16* error) {
+    const FilePath& extensions_dir, string16* error) {
   std::string content;
   if (!file_util::ReadFileToString(user_script_path, &content)) {
     *error = ASCIIToUTF16("Could not read source file.");
     return NULL;
   }
 
   if (!IsStringUTF8(content)) {
     *error = ASCIIToUTF16("User script must be UTF8 encoded.");
     return NULL;
   }
 
   UserScript script;
   if (!UserScriptMaster::ScriptReloader::ParseMetadataHeader(content,
                                                              &script)) {
     *error = ASCIIToUTF16("Invalid script header.");
     return NULL;
   }
 
-  FilePath user_data_temp_dir = extension_file_util::GetUserDataTempDir();
-  if (user_data_temp_dir.empty()) {
+  FilePath install_temp_dir =
+      extension_file_util::GetInstallTempDir(extensions_dir);
+  if (install_temp_dir.empty()) {
     *error = ASCIIToUTF16("Could not get path to profile temporary directory.");
     return NULL;
   }
 
   ScopedTempDir temp_dir;
-  if (!temp_dir.CreateUniqueTempDirUnderPath(user_data_temp_dir)) {
+  if (!temp_dir.CreateUniqueTempDirUnderPath(install_temp_dir)) {
     *error = ASCIIToUTF16("Could not create temporary directory.");
     return NULL;
   }
 
   // Create the manifest
   scoped_ptr<DictionaryValue> root(new DictionaryValue);
   std::string script_name;
   if (!script.name().empty() && !script.name_space().empty())
     script_name = script.name_space() + "/" + script.name();
   else
@@ skipping 111 matching lines @@
   if (!extension) {
     NOTREACHED() << "Could not init extension " << *error;
     return NULL;
   }
 
   temp_dir.Take();  // The caller takes ownership of the directory.
   return extension;
 }
 
 }  // namespace extensions