| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/extensions/extension_garbage_collector_chromeos.h" | 5 #include "chrome/browser/extensions/extension_garbage_collector_chromeos.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> |
| 8 #include <vector> | 9 #include <vector> |
| 9 | 10 |
| 10 #include "base/files/file_util.h" | 11 #include "base/files/file_util.h" |
| 12 #include "base/memory/ptr_util.h" |
| 11 #include "base/strings/string_split.h" | 13 #include "base/strings/string_split.h" |
| 12 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
| 13 #include "base/threading/sequenced_worker_pool.h" | 15 #include "base/threading/sequenced_worker_pool.h" |
| 14 #include "base/values.h" | 16 #include "base/values.h" |
| 15 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" | 17 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" |
| 16 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" | 18 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
| 17 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 19 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 18 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" | 20 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" |
| 19 #include "chrome/browser/extensions/extension_service.h" | 21 #include "chrome/browser/extensions/extension_service.h" |
| 20 #include "chrome/browser/extensions/extension_service_test_base.h" | 22 #include "chrome/browser/extensions/extension_service_test_base.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 return path; | 93 return path; |
| 92 } | 94 } |
| 93 | 95 |
| 94 void CreateSharedExtensionPrefs(const std::string& id, | 96 void CreateSharedExtensionPrefs(const std::string& id, |
| 95 const std::string& version, | 97 const std::string& version, |
| 96 const std::string& users_string, | 98 const std::string& users_string, |
| 97 const base::FilePath& path) { | 99 const base::FilePath& path) { |
| 98 DictionaryPrefUpdate shared_extensions(testing_local_state_.Get(), | 100 DictionaryPrefUpdate shared_extensions(testing_local_state_.Get(), |
| 99 ExtensionAssetsManagerChromeOS::kSharedExtensions); | 101 ExtensionAssetsManagerChromeOS::kSharedExtensions); |
| 100 | 102 |
| 101 base::DictionaryValue* extension_info = NULL; | 103 base::DictionaryValue* extension_info_weak = NULL; |
| 102 if (!shared_extensions->GetDictionary(id, &extension_info)) { | 104 if (!shared_extensions->GetDictionary(id, &extension_info_weak)) { |
| 103 extension_info = new base::DictionaryValue; | 105 auto extension_info = base::MakeUnique<base::DictionaryValue>(); |
| 104 shared_extensions->Set(id, extension_info); | 106 extension_info_weak = extension_info.get(); |
| 107 shared_extensions->Set(id, std::move(extension_info)); |
| 105 } | 108 } |
| 106 | 109 |
| 107 base::DictionaryValue* version_info = new base::DictionaryValue; | 110 auto version_info = base::MakeUnique<base::DictionaryValue>(); |
| 108 extension_info->SetWithoutPathExpansion(version, version_info); | |
| 109 version_info->SetString( | 111 version_info->SetString( |
| 110 ExtensionAssetsManagerChromeOS::kSharedExtensionPath, path.value()); | 112 ExtensionAssetsManagerChromeOS::kSharedExtensionPath, path.value()); |
| 111 | 113 |
| 112 base::ListValue* users = new base::ListValue; | 114 auto users = base::MakeUnique<base::ListValue>(); |
| 115 for (const std::string& user : |
| 116 base::SplitString(users_string, ",", base::KEEP_WHITESPACE, |
| 117 base::SPLIT_WANT_NONEMPTY)) { |
| 118 users->AppendString(user); |
| 119 } |
| 113 version_info->Set(ExtensionAssetsManagerChromeOS::kSharedExtensionUsers, | 120 version_info->Set(ExtensionAssetsManagerChromeOS::kSharedExtensionUsers, |
| 114 users); | 121 std::move(users)); |
| 115 for (const std::string& user : | 122 extension_info_weak->SetWithoutPathExpansion(version, |
| 116 base::SplitString(users_string, ",", | 123 std::move(version_info)); |
| 117 base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) | |
| 118 users->AppendString(user); | |
| 119 } | 124 } |
| 120 | 125 |
| 121 scoped_refptr<Extension> CreateExtension(const std::string& id, | 126 scoped_refptr<Extension> CreateExtension(const std::string& id, |
| 122 const std::string& version, | 127 const std::string& version, |
| 123 const base::FilePath& path) { | 128 const base::FilePath& path) { |
| 124 base::DictionaryValue manifest; | 129 base::DictionaryValue manifest; |
| 125 manifest.SetString(manifest_keys::kName, "test"); | 130 manifest.SetString(manifest_keys::kName, "test"); |
| 126 manifest.SetString(manifest_keys::kVersion, version); | 131 manifest.SetString(manifest_keys::kVersion, version); |
| 127 | 132 |
| 128 std::string error; | 133 std::string error; |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 | 196 |
| 192 const base::DictionaryValue* shared_extensions = testing_local_state_.Get()-> | 197 const base::DictionaryValue* shared_extensions = testing_local_state_.Get()-> |
| 193 GetDictionary(ExtensionAssetsManagerChromeOS::kSharedExtensions); | 198 GetDictionary(ExtensionAssetsManagerChromeOS::kSharedExtensions); |
| 194 ASSERT_TRUE(shared_extensions); | 199 ASSERT_TRUE(shared_extensions); |
| 195 | 200 |
| 196 EXPECT_FALSE(shared_extensions->HasKey(kExtensionId1)); | 201 EXPECT_FALSE(shared_extensions->HasKey(kExtensionId1)); |
| 197 EXPECT_TRUE(shared_extensions->HasKey(kExtensionId2)); | 202 EXPECT_TRUE(shared_extensions->HasKey(kExtensionId2)); |
| 198 } | 203 } |
| 199 | 204 |
| 200 } // namespace extensions | 205 } // namespace extensions |
| OLD | NEW |