Move creation and ownership of ResourceDispatcherHost and PluginService to content. This gives a ...

chrome/browser/extensions/sandboxed_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/browser/extensions/sandboxed_extension_unpacker.h"
 
 #include <set>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 145 matching lines @@
   // 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
 
 SandboxedExtensionUnpacker::SandboxedExtensionUnpacker(
     const FilePath& crx_path,
-    ResourceDispatcherHost* rdh,
     Extension::Location location,
     int creation_flags,
     SandboxedExtensionUnpackerClient* client)
     : crx_path_(crx_path),
       thread_identifier_(BrowserThread::ID_COUNT),
-      rdh_(rdh), client_(client), got_response_(false),
-      location_(location), creation_flags_(creation_flags) {
+      client_(client),
+      got_response_(false),
+      location_(location),
+      creation_flags_(creation_flags),
+      use_utility_process_(true) {
 }
 
 bool SandboxedExtensionUnpacker::CreateTempDirectory() {
   CHECK(BrowserThread::GetCurrentThreadIdentifier(&thread_identifier_));
 
   FilePath temp_dir;
   if (!FindWritableTempLocation(&temp_dir)) {
     ReportFailure(
         COULD_NOT_GET_TEMP_DIRECTORY,
         l10n_util::GetStringFUTF16(
@@ skipping 48 matching lines @@
         l10n_util::GetStringFUTF16(
             IDS_EXTENSION_PACKAGE_INSTALL_ERROR,
             ASCIIToUTF16("FAILED_TO_COPY_EXTENSION_FILE_TO_TEMP_DIRECTORY")));
     return;
   }
 
   // If we are supposed to use a subprocess, kick off the subprocess.
   //
   // TODO(asargent) we shouldn't need to do this branch here - instead
   // UtilityProcessHost should handle it for us. (http://crbug.com/19192)
-  bool use_utility_process = rdh_ &&
+  bool use_utility_process = use_utility_process_ &&
       !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
   if (use_utility_process) {
     // The utility process will have access to the directory passed to
     // SandboxedExtensionUnpacker.  That directory should not contain a
     // symlink or NTFS reparse point.  When the path is used, following
     // the link/reparse point will cause file system access outside the
     // sandbox path, and the sandbox will deny the operation.
     FilePath link_free_crx_path;
     if (!file_util::NormalizeFilePath(temp_crx_path, &link_free_crx_path)) {
       LOG(ERROR) << "Could not get the normalized path of "
@@ skipping 515 matching lines @@
           ERROR_SAVING_CATALOG,
           l10n_util::GetStringFUTF16(
               IDS_EXTENSION_PACKAGE_INSTALL_ERROR,
               ASCIIToUTF16("ERROR_SAVING_CATALOG")));
       return false;
     }
   }
 
   return true;
 }