Remove base::Value::CreateNullValue

components/arc/bluetooth/bluetooth_type_converters.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 <algorithm>
 #include <cctype>
 #include <iomanip>
 #include <ios>
 #include <memory>
 #include <sstream>
@@ skipping 109 matching lines @@
 TypeConverter<arc::mojom::BluetoothSdpAttributePtr,
               bluez::BluetoothServiceAttributeValueBlueZ>::
     Convert(const bluez::BluetoothServiceAttributeValueBlueZ& attr_bluez,
             size_t depth) {
   auto result = arc::mojom::BluetoothSdpAttribute::New();
   result->type = attr_bluez.type();
   result->type_size = 0;
 
   switch (result->type) {
     case bluez::BluetoothServiceAttributeValueBlueZ::NULLTYPE:
-      result->value.Append(base::Value::CreateNullValue());
+      result->value.Append(base::MakeUnique<base::Value>());
       break;
     case bluez::BluetoothServiceAttributeValueBlueZ::UINT:
     case bluez::BluetoothServiceAttributeValueBlueZ::INT:
     case bluez::BluetoothServiceAttributeValueBlueZ::UUID:
     case bluez::BluetoothServiceAttributeValueBlueZ::STRING:
     case bluez::BluetoothServiceAttributeValueBlueZ::URL:
     case bluez::BluetoothServiceAttributeValueBlueZ::BOOL:
       result->type_size = attr_bluez.size();
       result->value.Append(attr_bluez.value().CreateDeepCopy());
       break;
     case bluez::BluetoothServiceAttributeValueBlueZ::SEQUENCE:
       if (depth + 1 >= arc::kBluetoothSDPMaxDepth) {
         result->type = bluez::BluetoothServiceAttributeValueBlueZ::NULLTYPE;
         result->type_size = 0;
-        result->value.Append(base::Value::CreateNullValue());
+        result->value.Append(base::MakeUnique<base::Value>());
         return result;
       }
       for (const auto& child : attr_bluez.sequence()) {
         result->sequence.push_back(Convert(child, depth + 1));
       }
       result->type_size = result->sequence.size();
       result->value.Clear();
       break;
     default:
       NOTREACHED();
@@ skipping 14 matching lines @@
       return bluez::BluetoothServiceAttributeValueBlueZ();
     case bluez::BluetoothServiceAttributeValueBlueZ::UINT:
     case bluez::BluetoothServiceAttributeValueBlueZ::INT:
     case bluez::BluetoothServiceAttributeValueBlueZ::UUID:
     case bluez::BluetoothServiceAttributeValueBlueZ::STRING:
     case bluez::BluetoothServiceAttributeValueBlueZ::URL:
     case bluez::BluetoothServiceAttributeValueBlueZ::BOOL: {
       if (attr->value.GetSize() != 1) {
         return bluez::BluetoothServiceAttributeValueBlueZ(
             bluez::BluetoothServiceAttributeValueBlueZ::NULLTYPE, 0,
-            base::Value::CreateNullValue());
+            base::MakeUnique<base::Value>());
       }
 
       std::unique_ptr<base::Value> value;
       attr->value.Remove(0, &value);
 
       return bluez::BluetoothServiceAttributeValueBlueZ(
           type, static_cast<size_t>(attr->type_size), std::move(value));
     }
     case bluez::BluetoothServiceAttributeValueBlueZ::SEQUENCE: {
       if (depth + 1 >= arc::kBluetoothSDPMaxDepth || attr->sequence.empty()) {
         return bluez::BluetoothServiceAttributeValueBlueZ(
             bluez::BluetoothServiceAttributeValueBlueZ::NULLTYPE, 0,
-            base::Value::CreateNullValue());
+            base::MakeUnique<base::Value>());
       }
 
       auto bluez_sequence = base::MakeUnique<
           bluez::BluetoothServiceAttributeValueBlueZ::Sequence>();
       for (const auto& child : attr->sequence) {
         bluez_sequence->push_back(Convert(child, depth + 1));
       }
       return bluez::BluetoothServiceAttributeValueBlueZ(
           std::move(bluez_sequence));
       break;
     }
     default:
       NOTREACHED();
   }
   return bluez::BluetoothServiceAttributeValueBlueZ(
       bluez::BluetoothServiceAttributeValueBlueZ::NULLTYPE, 0,
-      base::Value::CreateNullValue());
+      base::MakeUnique<base::Value>());
 }
 
 // static
 arc::mojom::BluetoothSdpRecordPtr
 TypeConverter<arc::mojom::BluetoothSdpRecordPtr,
               bluez::BluetoothServiceRecordBlueZ>::
     Convert(const bluez::BluetoothServiceRecordBlueZ& record_bluez) {
   arc::mojom::BluetoothSdpRecordPtr result =
       arc::mojom::BluetoothSdpRecord::New();
 
@@ skipping 37 matching lines @@
       default:
         NOTREACHED();
         break;
     }
   }
 
   return record_bluez;
 }
 
 }  // namespace mojo