Stop passing raw pointers to base::Value API in c/b/ui

chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc

 // Copyright 2013 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/ui/webui/translate_internals/translate_internals_handler.h"
 
 #include <map>
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/browser/translate_error_details.h"
@@ skipping 58 matching lines @@
           .ptr();
   content::WebContents* web_contents =
       content::Source<content::WebContents>(source).ptr();
 
   if (web_contents->GetBrowserContext()->IsOffTheRecord() ||
       !TranslateService::IsTranslatableURL(language_detection_details->url)) {
     return;
   }
 
   base::DictionaryValue dict;
-  dict.Set("time",
-           new base::Value(language_detection_details->time.ToJsTime()));
-  dict.Set("url", new base::Value(language_detection_details->url.spec()));
+  dict.Set("time", base::MakeUnique<base::Value>(

[jdoerrie, 2017/04/13 09:08:52]

SetDouble

[vabr (Chromium), 2017/04/13 12:03:15]

Done.

+                       language_detection_details->time.ToJsTime()));
+  dict.Set("url", base::MakeUnique<base::Value>(

[jdoerrie, 2017/04/13 09:08:52]

SetString

[vabr (Chromium), 2017/04/13 12:03:15]

Done.

+                      language_detection_details->url.spec()));
   dict.Set("content_language",

[jdoerrie, 2017/04/13 09:08:53]

SetString

[vabr (Chromium), 2017/04/13 12:03:15]

Done.

-           new base::Value(language_detection_details->content_language));
-  dict.Set("cld_language",
-           new base::Value(language_detection_details->cld_language));
-  dict.Set("is_cld_reliable",
-           new base::Value(language_detection_details->is_cld_reliable));
-  dict.Set("has_notranslate",
-           new base::Value(language_detection_details->has_notranslate));
+           base::MakeUnique<base::Value>(
+               language_detection_details->content_language));
+  dict.Set("cld_language", base::MakeUnique<base::Value>(

[jdoerrie, 2017/04/13 09:08:52]

SetString

[vabr (Chromium), 2017/04/13 12:03:15]

Done.

+                               language_detection_details->cld_language));
+  dict.Set("is_cld_reliable", base::MakeUnique<base::Value>(

[jdoerrie, 2017/04/13 09:08:53]

SetBoolean

[vabr (Chromium), 2017/04/13 12:03:15]

Done.

+                                  language_detection_details->is_cld_reliable));
+  dict.Set("has_notranslate", base::MakeUnique<base::Value>(

[jdoerrie, 2017/04/13 09:08:52]

SetBoolean

[vabr (Chromium), 2017/04/13 12:03:15]

Done.

+                                  language_detection_details->has_notranslate));
   dict.Set("html_root_language",

[jdoerrie, 2017/04/13 09:08:53]

SetString

[vabr (Chromium), 2017/04/13 12:03:15]

Done.

-           new base::Value(language_detection_details->html_root_language));
+           base::MakeUnique<base::Value>(
+               language_detection_details->html_root_language));
   dict.Set("adopted_language",

[jdoerrie, 2017/04/13 09:08:52]

SetString

[vabr (Chromium), 2017/04/13 12:03:15]

Done.

-           new base::Value(language_detection_details->adopted_language));
-  dict.Set("content", new base::Value(language_detection_details->contents));
+           base::MakeUnique<base::Value>(
+               language_detection_details->adopted_language));
+  dict.Set("content",

[jdoerrie, 2017/04/13 09:08:53]

SetString

[vabr (Chromium), 2017/04/13 12:03:15]

Done.

+           base::MakeUnique<base::Value>(language_detection_details->contents));
   SendMessageToJs("languageDetectionInfoAdded", dict);
 }
 
 void TranslateInternalsHandler::OnTranslateError(
     const translate::TranslateErrorDetails& details) {
   base::DictionaryValue dict;
-  dict.Set("time", new base::Value(details.time.ToJsTime()));
-  dict.Set("url", new base::Value(details.url.spec()));
-  dict.Set("error", new base::Value(details.error));
+  dict.Set("time", base::MakeUnique<base::Value>(details.time.ToJsTime()));
+  dict.Set("url", base::MakeUnique<base::Value>(details.url.spec()));
+  dict.Set("error", base::MakeUnique<base::Value>(details.error));

[jdoerrie, 2017/04/13 09:08:52]

SetDouble
SetString
SetInteger

[vabr (Chromium), 2017/04/13 12:03:15]

Done.

   SendMessageToJs("translateErrorDetailsAdded", dict);
 }
 
 void TranslateInternalsHandler::OnTranslateEvent(
     const translate::TranslateEventDetails& details) {
   base::DictionaryValue dict;
-  dict.Set("time", new base::Value(details.time.ToJsTime()));
-  dict.Set("filename", new base::Value(details.filename));
-  dict.Set("line", new base::Value(details.line));
-  dict.Set("message", new base::Value(details.message));
+  dict.Set("time", base::MakeUnique<base::Value>(details.time.ToJsTime()));
+  dict.Set("filename", base::MakeUnique<base::Value>(details.filename));
+  dict.Set("line", base::MakeUnique<base::Value>(details.line));
+  dict.Set("message", base::MakeUnique<base::Value>(details.message));

[jdoerrie, 2017/04/13 09:08:52]

SetDouble
SetString
SetInteger
SetString

[vabr (Chromium), 2017/04/13 12:03:15]

Done.

   SendMessageToJs("translateEventDetailsAdded", dict);
 }
 
 void TranslateInternalsHandler::OnRemovePrefItem(const base::ListValue* args) {
   content::WebContents* web_contents = web_ui()->GetWebContents();
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   PrefService* prefs = profile->GetOriginalProfile()->GetPrefs();
   std::unique_ptr<translate::TranslatePrefs> translate_prefs(
       ChromeTranslateClient::CreateTranslatePrefs(prefs));
@@ skipping 68 matching lines @@
       translate::TranslatePrefs::kPrefTranslateWhitelists,
       translate::TranslatePrefs::kPrefTranslateDeniedCount,
       translate::TranslatePrefs::kPrefTranslateIgnoredCount,
       translate::TranslatePrefs::kPrefTranslateAcceptedCount,
       translate::TranslatePrefs::kPrefTranslateLastDeniedTimeForLanguage,
       translate::TranslatePrefs::kPrefTranslateTooOftenDeniedForLanguage,
   };
   for (const char* key : keys) {
     const PrefService::Preference* pref = prefs->FindPreference(key);
     if (pref)
-      dict.Set(key, pref->GetValue()->DeepCopy());
+      dict.Set(key, base::MakeUnique<base::Value>(*pref->GetValue()));
   }
 
   SendMessageToJs("prefsUpdated", dict);
 }
 
 void TranslateInternalsHandler::SendSupportedLanguagesToJs() {
   base::DictionaryValue dict;
 
   std::vector<std::string> languages;
   translate::TranslateDownloadManager::GetSupportedLanguages(&languages);
   base::Time last_updated =
       translate::TranslateDownloadManager::GetSupportedLanguagesLastUpdated();
 
-  base::ListValue* languages_list = new base::ListValue();
-  base::ListValue* alpha_languages_list = new base::ListValue();
+  auto languages_list = base::MakeUnique<base::ListValue>();
+  auto alpha_languages_list = base::MakeUnique<base::ListValue>();
   for (std::vector<std::string>::iterator it = languages.begin();
        it != languages.end(); ++it) {
     const std::string& lang = *it;
     languages_list->AppendString(lang);
     if (translate::TranslateDownloadManager::IsAlphaLanguage(lang))
       alpha_languages_list->AppendString(lang);
   }
 
-  dict.Set("languages", languages_list);
-  dict.Set("alpha_languages", alpha_languages_list);
-  dict.Set("last_updated", new base::Value(last_updated.ToJsTime()));
+  dict.Set("languages", std::move(languages_list));
+  dict.Set("alpha_languages", std::move(alpha_languages_list));
+  dict.Set("last_updated",

[jdoerrie, 2017/04/13 09:08:52]

SetDouble

[vabr (Chromium), 2017/04/13 12:03:15]

Done.

+           base::MakeUnique<base::Value>(last_updated.ToJsTime()));
   SendMessageToJs("supportedLanguagesUpdated", dict);
 }
 
 void TranslateInternalsHandler::SendCountryToJs(bool was_updated) {
   std::string country;
   variations::VariationsService* variations_service =
       g_browser_process->variations_service();
   if (variations_service)
     country = variations_service->GetStoredPermanentCountry();
 
   base::DictionaryValue dict;
   if (!country.empty()) {
-    dict.Set("country", new base::Value(country));
-    dict.Set("update", new base::Value(was_updated));
+    dict.Set("country", base::MakeUnique<base::Value>(country));
+    dict.Set("update", base::MakeUnique<base::Value>(was_updated));

[jdoerrie, 2017/04/13 09:08:53]

SetString
SetBoolean

[vabr (Chromium), 2017/04/13 12:03:14]

Done.

   }
   SendMessageToJs("countryUpdated", dict);
 }