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

chrome/browser/ui/webui/predictors/predictors_handler.cc

 // Copyright (c) 2012 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/predictors/predictors_handler.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
-#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/resource_type.h"
 
@@ skipping 39 matching lines @@
       base::Bind(&PredictorsHandler::RequestResourcePrefetchPredictorDb,
                  base::Unretained(this)));
 }
 
 void PredictorsHandler::RequestAutocompleteActionPredictorDb(
     const base::ListValue* args) {
   const bool enabled = (autocomplete_action_predictor_ != NULL);
   base::DictionaryValue dict;
   dict.SetBoolean("enabled", enabled);
   if (enabled) {
-    auto db = base::MakeUnique<base::ListValue>();
+    base::ListValue* db = new base::ListValue();
     for (AutocompleteActionPredictor::DBCacheMap::const_iterator it =
              autocomplete_action_predictor_->db_cache_.begin();
          it != autocomplete_action_predictor_->db_cache_.end();
          ++it) {
       std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue());
       entry->SetString("user_text", it->first.user_text);
       entry->SetString("url", it->first.url.spec());
       entry->SetInteger("hit_count", it->second.number_of_hits);
       entry->SetInteger("miss_count", it->second.number_of_misses);
       entry->SetDouble("confidence",
           autocomplete_action_predictor_->CalculateConfidenceForDbEntry(it));
       db->Append(std::move(entry));
     }
-    dict.Set("db", std::move(db));
+    dict.Set("db", db);
   }
 
   web_ui()->CallJavascriptFunctionUnsafe("updateAutocompleteActionPredictorDb",
                                          dict);
 }
 
 void PredictorsHandler::RequestResourcePrefetchPredictorDb(
     const base::ListValue* args) {
   const bool enabled = (resource_prefetch_predictor_ != NULL);
   base::DictionaryValue dict;
   dict.SetBoolean("enabled", enabled);
 
   if (enabled) {
     // Url Database cache.
-    auto db = base::MakeUnique<base::ListValue>();
+    base::ListValue* db = new base::ListValue();
     AddPrefetchDataMapToListValue(
-        *resource_prefetch_predictor_->url_table_cache_, db.get());
-    dict.Set("url_db", std::move(db));
+        *resource_prefetch_predictor_->url_table_cache_, db);
+    dict.Set("url_db", db);
 
-    db = base::MakeUnique<base::ListValue>();
+    db = new base::ListValue();
     AddPrefetchDataMapToListValue(
-        *resource_prefetch_predictor_->host_table_cache_, db.get());
-    dict.Set("host_db", std::move(db));
+        *resource_prefetch_predictor_->host_table_cache_, db);
+    dict.Set("host_db", db);
   }
 
   web_ui()->CallJavascriptFunctionUnsafe("updateResourcePrefetchPredictorDb",
                                          dict);
 }
 
 void PredictorsHandler::AddPrefetchDataMapToListValue(
     const ResourcePrefetchPredictor::PrefetchDataMap& data_map,
     base::ListValue* db) const {
   for (const auto& p : data_map) {
     std::unique_ptr<base::DictionaryValue> main(new base::DictionaryValue());
     main->SetString("main_frame_url", p.first);
-    auto resources = base::MakeUnique<base::ListValue>();
+    base::ListValue* resources = new base::ListValue();
     for (const predictors::ResourceData& r : p.second.resources()) {
       std::unique_ptr<base::DictionaryValue> resource(
           new base::DictionaryValue());
       resource->SetString("resource_url", r.resource_url());
       resource->SetString("resource_type",
                           ConvertResourceType(r.resource_type()));
       resource->SetInteger("number_of_hits", r.number_of_hits());
       resource->SetInteger("number_of_misses", r.number_of_misses());
       resource->SetInteger("consecutive_misses", r.consecutive_misses());
       resource->SetDouble("position", r.average_position());
       resource->SetDouble(
           "score", ResourcePrefetchPredictorTables::ComputeResourceScore(r));
       resource->SetBoolean(
           "is_prefetchable",
           resource_prefetch_predictor_->IsResourcePrefetchable(r));
       resources->Append(std::move(resource));
     }
-    main->Set("resources", std::move(resources));
+    main->Set("resources", resources);
     db->Append(std::move(main));
   }
 }