Revert of Change base::Value::ListStorage to std::vector<base::Value>

chromeos/printing/ppd_provider.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 "chromeos/printing/ppd_provider.h"
 
 #include <algorithm>
 #include <deque>
 #include <unordered_map>
 #include <utility>
@@ skipping 413 matching lines @@
 
     if (top_list.get() == nullptr) {
       // We got something malformed back.
       FailQueuedMetadataResolutions(PpdProvider::INTERNAL_ERROR);
       return;
     }
 
     // This should just be a simple list of locale strings.
     std::vector<std::string> available_locales;
     bool found_en = false;
-    for (const base::Value& entry : *top_list) {
+    for (const std::unique_ptr<base::Value>& entry : *top_list) {
       std::string tmp;
       // Locales should have at *least* a two-character country code.  100 is an
       // arbitrary upper bound for length to protect against extreme bogosity.
-      if (!entry.GetAsString(&tmp) || tmp.size() < 2 || tmp.size() > 100) {
+      if (!entry->GetAsString(&tmp) || tmp.size() < 2 || tmp.size() > 100) {
         FailQueuedMetadataResolutions(PpdProvider::INTERNAL_ERROR);
         return;
       }
       if (tmp == "en") {
         found_en = true;
       }
       available_locales.push_back(tmp);
     }
     if (available_locales.empty() || !found_en) {
       // We have no locales, or we didn't get an english locale (which is our
@@ skipping 147 matching lines @@
 
       if (top_list.get() == nullptr) {
         // We got something malformed back.
         LOG(ERROR) << "Malformed top list";
         result = PpdProvider::INTERNAL_ERROR;
       } else {
         // We'll set result to SUCCESS if we do find the device.
         result = PpdProvider::NOT_FOUND;
         for (const auto& entry : *top_list) {
           int device_id;
-          const base::ListValue* sub_list;
+          base::ListValue* sub_list;
 
           // Each entry should be a size-2 list with an integer and a string.
-          if (!entry.GetAsList(&sub_list) || sub_list->GetSize() != 2 ||
+          if (!entry->GetAsList(&sub_list) || sub_list->GetSize() != 2 ||
               !sub_list->GetInteger(0, &device_id) ||
               !sub_list->GetString(1, &contents) || device_id < 0 ||
               device_id > 0xffff) {
             // Malformed data.
             LOG(ERROR) << "Malformed line in usb device list";
             result = PpdProvider::INTERNAL_ERROR;
             break;
           }
           if (device_id == desired_device_id) {
             // Found it.
@@ skipping 164 matching lines @@
     if (tmp != PpdProvider::SUCCESS) {
       return tmp;
     }
     auto top_list = base::ListValue::From(base::JSONReader::Read(buffer));
 
     if (top_list.get() == nullptr) {
       // We got something malformed back.
       return PpdProvider::INTERNAL_ERROR;
     }
     for (const auto& entry : *top_list) {
-      const base::ListValue* sub_list;
+      base::ListValue* sub_list;
       contents->push_back({});
-      if (!entry.GetAsList(&sub_list) || sub_list->GetSize() != 2 ||
+      if (!entry->GetAsList(&sub_list) || sub_list->GetSize() != 2 ||
           !sub_list->GetString(0, &contents->back().first) ||
           !sub_list->GetString(1, &contents->back().second)) {
         contents->clear();
         return PpdProvider::INTERNAL_ERROR;
       }
     }
     return PpdProvider::SUCCESS;
   }
 
   // Create the list of manufacturers from |cached_metadata_|.  Requires that
@@ skipping 101 matching lines @@
     scoped_refptr<net::URLRequestContextGetter> url_context_getter,
     scoped_refptr<PpdCache> ppd_cache,
     scoped_refptr<base::SequencedTaskRunner> disk_task_runner,
     const PpdProvider::Options& options) {
   return scoped_refptr<PpdProvider>(
       new PpdProviderImpl(browser_locale, url_context_getter, ppd_cache,
                           disk_task_runner, options));
 }
 }  // namespace printing
 }  // namespace chromeos