Use std::unique_ptr for base::DictionaryValue and base::ListValue's internal store.

chrome/browser/ui/webui/settings/certificates_handler.cc

 // Copyright 2016 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/settings/certificates_handler.h"
 
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 70 matching lines @@
 };
 
 std::string OrgNameToId(const std::string& org) {
   return "org-" + org;
 }
 
 struct DictionaryIdComparator {
   explicit DictionaryIdComparator(icu::Collator* collator)
       : collator_(collator) {}
 
-  bool operator()(const base::Value* a, const base::Value* b) const {
+  bool operator()(const std::unique_ptr<base::Value>& a,
+                  const std::unique_ptr<base::Value>& b) const {
     DCHECK(a->GetType() == base::Value::TYPE_DICTIONARY);
     DCHECK(b->GetType() == base::Value::TYPE_DICTIONARY);
-    const base::DictionaryValue* a_dict =
-        reinterpret_cast<const base::DictionaryValue*>(a);
-    const base::DictionaryValue* b_dict =
-        reinterpret_cast<const base::DictionaryValue*>(b);
+    const base::DictionaryValue* a_dict;
+    if (!a->GetAsDictionary(&a_dict))
+      NOTREACHED();

[danakj, 2016/05/24 20:08:34]

nitto

[dcheng, 2016/05/24 20:39:02]

Done.

+    const base::DictionaryValue* b_dict;
+    if (!b->GetAsDictionary(&b_dict))
+      NOTREACHED();
     base::string16 a_str;
     base::string16 b_str;
     a_dict->GetString(kNameField, &a_str);
     b_dict->GetString(kNameField, &b_str);
     if (collator_ == NULL)
       return a_str < b_str;
     return base::i18n::CompareString16WithCollator(*collator_, a_str, b_str) ==
            UCOL_LESS;
   }
 
@@ skipping 1029 matching lines @@
   error_info->Set(kCertificateErrors,
                   base::WrapUnique(cert_error_list.release()));
   RejectCallback(*error_info);
 }
 
 gfx::NativeWindow CertificatesHandler::GetParentWindow() const {
   return web_ui()->GetWebContents()->GetTopLevelNativeWindow();
 }
 
 }  // namespace settings