Chromium Code Reviews| Index: chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc |
| diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc |
| index 260919628b176989cda3d5578c9059f800281eda..b16993865248f523eaf3bcfaff58f3623194954a 100644 |
| --- a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc |
| +++ b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc |
| @@ -5,9 +5,11 @@ |
| #include "chrome/browser/extensions/extension_garbage_collector_chromeos.h" |
| #include <string> |
| +#include <utility> |
| #include <vector> |
| #include "base/files/file_util.h" |
| +#include "base/memory/ptr_util.h" |
| #include "base/strings/string_split.h" |
| #include "base/strings/string_util.h" |
| #include "base/threading/sequenced_worker_pool.h" |
| @@ -98,24 +100,27 @@ class ExtensionGarbageCollectorChromeOSUnitTest |
| DictionaryPrefUpdate shared_extensions(testing_local_state_.Get(), |
| ExtensionAssetsManagerChromeOS::kSharedExtensions); |
| - base::DictionaryValue* extension_info = NULL; |
| - if (!shared_extensions->GetDictionary(id, &extension_info)) { |
| - extension_info = new base::DictionaryValue; |
| - shared_extensions->Set(id, extension_info); |
| + base::DictionaryValue* extension_info_weak = NULL; |
| + if (!shared_extensions->GetDictionary(id, &extension_info_weak)) { |
| + auto extension_info = base::MakeUnique<base::DictionaryValue>(); |
| + extension_info_weak = extension_info.get(); |
| + shared_extensions->Set(id, std::move(extension_info)); |
| } |
| - base::DictionaryValue* version_info = new base::DictionaryValue; |
| - extension_info->SetWithoutPathExpansion(version, version_info); |
| + auto version_info = base::MakeUnique<base::DictionaryValue>(); |
| version_info->SetString( |
| ExtensionAssetsManagerChromeOS::kSharedExtensionPath, path.value()); |
| - base::ListValue* users = new base::ListValue; |
| - version_info->Set(ExtensionAssetsManagerChromeOS::kSharedExtensionUsers, |
| - users); |
| + auto users = base::MakeUnique<base::ListValue>(); |
| for (const std::string& user : |
| - base::SplitString(users_string, ",", |
| - base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) |
| + base::SplitString(users_string, ",", base::KEEP_WHITESPACE, |
| + base::SPLIT_WANT_NONEMPTY)) { |
| users->AppendString(user); |
| + } |
|
jdoerrie
2017/04/06 14:25:51
Maybe drop the braces?
vabr (Chromium)
2017/04/07 20:40:40
The style guide says they are optional for "single
|
| + version_info->Set(ExtensionAssetsManagerChromeOS::kSharedExtensionUsers, |
| + std::move(users)); |
| + extension_info_weak->SetWithoutPathExpansion(version, |
| + std::move(version_info)); |
| } |
| scoped_refptr<Extension> CreateExtension(const std::string& id, |