Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions

chrome/browser/chromeos/file_system_provider/registry_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/file_system_provider/registry.h"
 
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/files/file_path.h"
+#include "base/memory/ptr_util.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
 #include "chrome/common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 26 matching lines @@
                             bool supports_notify_tag,
                             int opened_files_limit,
                             const Watcher& watcher) {
   // Warning. Updating this code means that backward compatibility may be
   // broken, what is unexpected and should be avoided.
   sync_preferences::TestingPrefServiceSyncable* const pref_service =
       profile->GetTestingPrefService();
   ASSERT_TRUE(pref_service);
 
   base::DictionaryValue extensions;
-  base::DictionaryValue* const file_systems = new base::DictionaryValue();
-  base::DictionaryValue* const file_system = new base::DictionaryValue();
+  auto file_system = base::MakeUnique<base::DictionaryValue>();
   file_system->SetStringWithoutPathExpansion(kPrefKeyFileSystemId,
                                              kFileSystemId);
   file_system->SetStringWithoutPathExpansion(kPrefKeyDisplayName, kDisplayName);
   file_system->SetBooleanWithoutPathExpansion(kPrefKeyWritable, writable);
   file_system->SetBooleanWithoutPathExpansion(kPrefKeySupportsNotifyTag,
                                               supports_notify_tag);
   file_system->SetIntegerWithoutPathExpansion(kPrefKeyOpenedFilesLimit,
                                               opened_files_limit);
-  file_systems->SetWithoutPathExpansion(kFileSystemId, file_system);
-  extensions.SetWithoutPathExpansion(kExtensionId, file_systems);
 
   // Remember watchers.
-  base::DictionaryValue* const watchers = new base::DictionaryValue();
-  file_system->SetWithoutPathExpansion(kPrefKeyWatchers, watchers);
-  base::DictionaryValue* const watcher_value = new base::DictionaryValue();
-  watchers->SetWithoutPathExpansion(watcher.entry_path.value(), watcher_value);
+  auto watcher_value = base::MakeUnique<base::DictionaryValue>();
   watcher_value->SetStringWithoutPathExpansion(kPrefKeyWatcherEntryPath,
                                                watcher.entry_path.value());
   watcher_value->SetBooleanWithoutPathExpansion(kPrefKeyWatcherRecursive,
                                                 watcher.recursive);
   watcher_value->SetStringWithoutPathExpansion(kPrefKeyWatcherLastTag,
                                                watcher.last_tag);
-  base::ListValue* const persistent_origins_value = new base::ListValue();
-  watcher_value->SetWithoutPathExpansion(kPrefKeyWatcherPersistentOrigins,
-                                         persistent_origins_value);
+  auto persistent_origins_value = base::MakeUnique<base::ListValue>();
   for (const auto& subscriber_it : watcher.subscribers) {
     if (subscriber_it.second.persistent)
       persistent_origins_value->AppendString(subscriber_it.first.spec());
   }
 
+  watcher_value->SetWithoutPathExpansion(kPrefKeyWatcherPersistentOrigins,
+                                         std::move(persistent_origins_value));
+  auto watchers = base::MakeUnique<base::DictionaryValue>();
+  watchers->SetWithoutPathExpansion(watcher.entry_path.value(),
+                                    std::move(watcher_value));
+  file_system->SetWithoutPathExpansion(kPrefKeyWatchers, std::move(watchers));
+  auto file_systems = base::MakeUnique<base::DictionaryValue>();
+  file_systems->SetWithoutPathExpansion(kFileSystemId, std::move(file_system));
+  extensions.SetWithoutPathExpansion(kExtensionId, std::move(file_systems));
   pref_service->Set(prefs::kFileSystemProviderMounted, extensions);
 }
 
 }  // namespace
 
 class FileSystemProviderRegistryTest : public testing::Test {
  protected:
   FileSystemProviderRegistryTest() : profile_(NULL) {}
 
   ~FileSystemProviderRegistryTest() override {}
@@ skipping 214 matching lines @@
       fake_watcher_.entry_path.value(), &watcher));
 
   std::string last_tag;
   EXPECT_TRUE(watcher->GetStringWithoutPathExpansion(kPrefKeyWatcherLastTag,
                                                      &last_tag));
   EXPECT_EQ(fake_watcher_.last_tag, last_tag);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos