summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/sandboxed_unpacker.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 21:15:09 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 21:15:09 +0000
commitdc24976fc87171d50b49f37bbaaa23ae53e51f4b (patch)
tree8d7c684afa0d65e22efc3384197ef5b50d867160 /chrome/browser/extensions/sandboxed_unpacker.cc
parentfc72bb18b111ff63e57135d97de6d59291f3b7b8 (diff)
downloadchromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.zip
chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.gz
chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.bz2
Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes, Part 2 of N BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/16295003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/sandboxed_unpacker.cc')
-rw-r--r--chrome/browser/extensions/sandboxed_unpacker.cc20
1 files changed, 8 insertions, 12 deletions
diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc
index b0a4ee7..d32455d 100644
--- a/chrome/browser/extensions/sandboxed_unpacker.cc
+++ b/chrome/browser/extensions/sandboxed_unpacker.cc
@@ -328,8 +328,8 @@ void SandboxedUnpacker::OnProcessCrashed(int exit_code) {
void SandboxedUnpacker::StartProcessOnIOThread(
const base::FilePath& temp_crx_path) {
- UtilityProcessHost* host = UtilityProcessHost::Create(
- this, unpacker_io_task_runner_);
+ UtilityProcessHost* host =
+ UtilityProcessHost::Create(this, unpacker_io_task_runner_.get());
// Grant the subprocess access to the entire subdir the extension file is
// in, so that it can unpack to that dir.
host->SetExposedDir(temp_crx_path.DirName());
@@ -375,11 +375,9 @@ void SandboxedUnpacker::OnUnpackExtensionSucceeded(
Extension::REQUIRE_KEY | creation_flags_,
&utf8_error);
-
- if (!extension_) {
- ReportFailure(
- INVALID_MANIFEST,
- ASCIIToUTF16("Manifest is invalid: " + utf8_error));
+ if (!extension_.get()) {
+ ReportFailure(INVALID_MANIFEST,
+ ASCIIToUTF16("Manifest is invalid: " + utf8_error));
return;
}
@@ -582,10 +580,8 @@ void SandboxedUnpacker::ReportSuccess(
crx_path_, base::TimeTicks::Now() - unpack_start_time_);
// Client takes ownership of temporary directory and extension.
- client_->OnUnpackSuccess(temp_dir_.Take(),
- extension_root_,
- &original_manifest,
- extension_);
+ client_->OnUnpackSuccess(
+ temp_dir_.Take(), extension_root_, &original_manifest, extension_.get());
extension_ = NULL;
}
@@ -642,7 +638,7 @@ bool SandboxedUnpacker::RewriteImageFiles() {
// out our own versions of the parsed images, and we want to make sure the
// originals are gone for good.
std::set<base::FilePath> image_paths =
- extension_file_util::GetBrowserImagePaths(extension_);
+ extension_file_util::GetBrowserImagePaths(extension_.get());
if (image_paths.size() != images.size()) {
// Decoded images don't match what's in the manifest.
ReportFailure(