Revert r63919 "Part 2 of immutable Extension refactor."

Compile failure on Linux x64.

BUG=56558
TEST=no functional change
TBR=aa

Review URL: http://codereview.chromium.org/4156002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63925 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 7 deletions

diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc
index ea5ec64..fc8aea8 100644
--- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc
+++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc
@@ -140,20 +140,18 @@ void SandboxedExtensionUnpacker::OnUnpackExtensionSucceeded(
   // extension was unpacked to. We use this until the extension is finally
   // installed. For example, the install UI shows images from inside the
   // extension.
+  extension_.reset(new Extension(extension_root_));
 
   // Localize manifest now, so confirm UI gets correct extension name.
   std::string error;
-  if (!extension_l10n_util::LocalizeExtension(extension_root_,
+  if (!extension_l10n_util::LocalizeExtension(extension_.get(),
                                               final_manifest.get(),
                                               &error)) {
     ReportFailure(error);
     return;
   }
 
-  extension_ = Extension::Create(
-      extension_root_, Extension::INTERNAL, *final_manifest, true, &error);
-
-  if (!extension_.get()) {
+  if (!extension_->InitFromValue(*final_manifest, true, &error)) {
     ReportFailure(std::string("Manifest is invalid: ") + error);
     return;
   }
@@ -272,8 +270,8 @@ void SandboxedExtensionUnpacker::ReportFailure(const std::string& error) {
 
 void SandboxedExtensionUnpacker::ReportSuccess() {
   // Client takes ownership of temporary directory and extension.
-  client_->OnUnpackSuccess(temp_dir_.Take(), extension_root_, extension_);
-  extension_ = NULL;
+  client_->OnUnpackSuccess(temp_dir_.Take(), extension_root_,
+                           extension_.release());
 }
 
 DictionaryValue* SandboxedExtensionUnpacker::RewriteManifestFile(