Move extension unpack intermediate dir to Extensions/Temp

chrome/browser/extensions/sandboxed_unpacker.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/sandboxed_unpacker.h"
 
 #include <set>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 129 matching lines @@
 
   return normalized;
 }
 
 // This function tries to find a location for unpacking the extension archive
 // that is writable and does not lie on a shared drive so that the sandboxed
 // unpacking process can write there. If no such location exists we can not
 // proceed and should fail.
 // The result will be written to |temp_dir|. The function will write to this
 // parameter even if it returns false.
-bool FindWritableTempLocation(FilePath* temp_dir) {
+bool FindWritableTempLocation(const FilePath& extensions_dir,
+                              FilePath* temp_dir) {
   PathService::Get(base::DIR_TEMP, temp_dir);
   if (VerifyJunctionFreeLocation(temp_dir))
     return true;
-  *temp_dir = extension_file_util::GetUserDataTempDir();
+  *temp_dir = extension_file_util::GetInstallTempDir(extensions_dir);
   if (VerifyJunctionFreeLocation(temp_dir))
     return true;
   // Neither paths is link free chances are good installation will fail.
   LOG(ERROR) << "Both the %TEMP% folder and the profile seem to be on "
              << "remote drives or read-only. Installation can not complete!";
   return false;
 }
 
 }  // namespace
 
 namespace extensions {
 
 SandboxedUnpacker::SandboxedUnpacker(
     const FilePath& crx_path,
     bool run_out_of_process,
     Extension::Location location,
     int creation_flags,
+    const FilePath& extensions_dir,
     SandboxedUnpackerClient* client)
     : crx_path_(crx_path),
       thread_identifier_(BrowserThread::ID_COUNT),
       run_out_of_process_(run_out_of_process),
       client_(client),
+      extensions_dir_(extensions_dir),
       got_response_(false),
       location_(location),
       creation_flags_(creation_flags) {
 }
 
 bool SandboxedUnpacker::CreateTempDirectory() {
   CHECK(BrowserThread::GetCurrentThreadIdentifier(&thread_identifier_));
 
   FilePath temp_dir;
-  if (!FindWritableTempLocation(&temp_dir)) {
+  if (!FindWritableTempLocation(extensions_dir_, &temp_dir)) {
     ReportFailure(
         COULD_NOT_GET_TEMP_DIRECTORY,
         l10n_util::GetStringFUTF16(
             IDS_EXTENSION_PACKAGE_INSTALL_ERROR,
             ASCIIToUTF16("COULD_NOT_GET_TEMP_DIRECTORY")));
     return false;
   }
 
   if (!temp_dir_.CreateUniqueTempDirUnderPath(temp_dir)) {
     ReportFailure(
@@ skipping 580 matching lines @@
               IDS_EXTENSION_PACKAGE_INSTALL_ERROR,
               ASCIIToUTF16("ERROR_SAVING_CATALOG")));
       return false;
     }
   }
 
   return true;
 }
 
 }  // namespace extensions