Upstream version 9.38.198.0

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

diff --git a/src/chrome/browser/extensions/extension_assets_manager_chromeos.cc b/src/chrome/browser/extensions/extension_assets_manager_chromeos.cc
index d76d86a..e74842b 100644 (file)
--- a/src/chrome/browser/extensions/extension_assets_manager_chromeos.cc
+++ b/src/chrome/browser/extensions/extension_assets_manager_chromeos.cc
@@ -16,10 +16,13 @@
 #include "base/sequenced_task_runner.h"
 #include "base/sys_info.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/extensions/extension_constants.h"
+#include "chrome/common/extensions/manifest_url_handler.h"
 #include "chromeos/chromeos_switches.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
@@ -142,7 +145,7 @@ void ExtensionAssetsManagerChromeOS::InstallExtension(
     const base::FilePath& local_install_dir,
     Profile* profile,
     InstallExtensionCallback callback) {
-  if (!CanShareAssets(extension)) {
+  if (!CanShareAssets(extension, unpacked_extension_root)) {
     InstallLocalExtension(extension->id(),
                           extension->VersionString(),
                           unpacked_extension_root,
@@ -190,6 +193,12 @@ base::FilePath ExtensionAssetsManagerChromeOS::GetSharedInstallDir() {
 }
 
 // static
+bool ExtensionAssetsManagerChromeOS::IsSharedInstall(
+    const Extension* extension) {
+  return GetSharedInstallDir().IsParent(extension->path());
+}
+
+// static
 bool ExtensionAssetsManagerChromeOS::CleanUpSharedExtensions(
     std::multimap<std::string, base::FilePath>* live_extension_paths) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -242,12 +251,19 @@ base::SequencedTaskRunner* ExtensionAssetsManagerChromeOS::GetFileTaskRunner(
 
 // static
 bool ExtensionAssetsManagerChromeOS::CanShareAssets(
-    const Extension* extension) {
+    const Extension* extension,
+    const base::FilePath& unpacked_extension_root) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kEnableExtensionAssetsSharing)) {
     return false;
   }
 
+  GURL update_url = ManifestURL::GetUpdateURL(extension);
+  if (!update_url.is_empty() &&
+      !extension_urls::IsWebstoreUpdateUrl(update_url)) {
+    return false;
+  }
+
   // Chrome caches crx files for installed by default apps so sharing assets is
   // also possible. User specific apps should be excluded to not expose apps
   // unique for the user outside of user's cryptohome.
@@ -265,7 +281,7 @@ void ExtensionAssetsManagerChromeOS::CheckSharedExtension(
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   const std::string& user_id = profile->GetProfileName();
-  chromeos::UserManager* user_manager = chromeos::UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   if (!user_manager) {
     NOTREACHED();
     return;
@@ -481,7 +497,7 @@ bool ExtensionAssetsManagerChromeOS::CleanUpExtension(
     const std::string& id,
     base::DictionaryValue* extension_info,
     std::multimap<std::string, base::FilePath>* live_extension_paths) {
-  chromeos::UserManager* user_manager = chromeos::UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   if (!user_manager) {
     NOTREACHED();
     return false;
@@ -514,14 +530,15 @@ bool ExtensionAssetsManagerChromeOS::CleanUpExtension(
         NOTREACHED();
         return false;
       }
-      const chromeos::User* user = user_manager->FindUser(user_id);
+      const user_manager::User* user = user_manager->FindUser(user_id);
       bool not_used = false;
       if (!user) {
         not_used = true;
       } else if (user->is_logged_in()) {
         // For logged in user also check that this path is actually used as
         // installed extension or as delayed install.
-        Profile* profile = user_manager->GetProfileByUser(user);
+        Profile* profile =
+            chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(user);
         ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(profile);
         if (!extension_prefs || extension_prefs->pref_service()->ReadOnly())
           return false;