Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / sandboxed_unpacker.cc

diff --git a/src/chrome/browser/extensions/sandboxed_unpacker.cc b/src/chrome/browser/extensions/sandboxed_unpacker.cc
index bfdc115..a535cb5 100644 (file)
--- a/src/chrome/browser/extensions/sandboxed_unpacker.cc
+++ b/src/chrome/browser/extensions/sandboxed_unpacker.cc
@@ -9,7 +9,7 @@
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/files/file_util_proxy.h"
 #include "base/files/scoped_file.h"
 #include "base/json/json_string_value_serializer.h"
@@ -26,8 +26,10 @@
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
 #include "chrome/common/extensions/extension_file_util.h"
+#include "chrome/grit/generated_resources.h"
 #include "components/crx_file/constants.h"
 #include "components/crx_file/crx_file.h"
+#include "components/crx_file/id_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/common/common_param_traits.h"
@@ -36,10 +38,8 @@
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_l10n_util.h"
 #include "extensions/common/file_util.h"
-#include "extensions/common/id_util.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
-#include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
@@ -219,7 +219,7 @@ SandboxedUnpacker::SandboxedUnpacker(
     Manifest::Location location,
     int creation_flags,
     const base::FilePath& extensions_dir,
-    base::SequencedTaskRunner* unpacker_io_task_runner,
+    const scoped_refptr<base::SequencedTaskRunner>& unpacker_io_task_runner,
     SandboxedUnpackerClient* client)
     : crx_path_(crx_path),
       client_(client),
@@ -579,7 +579,7 @@ bool SandboxedUnpacker::ValidateSignature() {
       std::string(reinterpret_cast<char*>(&key.front()), key.size());
   base::Base64Encode(public_key, &public_key_);
 
-  extension_id_ = id_util::GenerateId(public_key);
+  extension_id_ = crx_file::id_util::GenerateId(public_key);
 
   return true;
 }
@@ -696,8 +696,9 @@ bool SandboxedUnpacker::RewriteImageFiles(SkBitmap* install_icon) {
     }
   }
 
-  const std::string& install_icon_path = IconsInfo::GetIcons(extension_).Get(
-      extension_misc::EXTENSION_ICON_LARGE, ExtensionIconSet::MATCH_BIGGER);
+  const std::string& install_icon_path =
+      IconsInfo::GetIcons(extension_.get()).Get(
+          extension_misc::EXTENSION_ICON_LARGE, ExtensionIconSet::MATCH_BIGGER);
 
   // Write our parsed images back to disk as well.
   for (size_t i = 0; i < images.size(); ++i) {