Upstream version 9.38.204.0

[platform/framework/web/crosswalk.git] / src / xwalk / application / common / package / xpk_package.cc

diff --git a/src/xwalk/application/common/installer/xpk_package.cc b/src/xwalk/application/common/package/xpk_package.cc
similarity index 94%
rename from src/xwalk/application/common/installer/xpk_package.cc
rename to src/xwalk/application/common/package/xpk_package.cc
index 149bd73..fb2b62d 100644 (file)
--- a/src/xwalk/application/common/installer/xpk_package.cc
+++ b/src/xwalk/application/common/package/xpk_package.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "xwalk/application/common/installer/xpk_package.h"
+#include "xwalk/application/common/package/xpk_package.h"
 
 #include "base/file_util.h"
 #include "base/files/scoped_file.h"
@@ -65,7 +65,6 @@ XPKPackage::XPKPackage(const base::FilePath& path)
             std::string(reinterpret_cast<char*>(&key_.front()), key_.size());
         id_ = GenerateId(public_key);
   }
-  return;
 }
 
 bool XPKPackage::VerifySignature() {
@@ -90,7 +89,7 @@ bool XPKPackage::VerifySignature() {
   return true;
 }
 
-bool XPKPackage::Extract(base::FilePath* target_path) {
+bool XPKPackage::ExtractToTemporaryDir(base::FilePath* target_path) {
   if (is_extracted_) {
     *target_path = temp_dir_.path();
     return true;
@@ -101,7 +100,7 @@ bool XPKPackage::Extract(base::FilePath* target_path) {
     return false;
   }
 
-  return Package::Extract(target_path);
+  return Package::ExtractToTemporaryDir(target_path);
 }
 
 }  // namespace application