Inline StringValue into base::Value

base/json/json_parser.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 "base/json/json_parser.h"
 
 #include <cmath>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 126 matching lines @@
 };
 
 // A variant on StringValue that uses StringPiece instead of copying the string
 // into the Value. This can only be stored in a child of hidden root (above),
 // otherwise the referenced string will not be guaranteed to outlive it.
 class JSONStringValue : public Value {
  public:
   explicit JSONStringValue(StringPiece piece)
       : Value(Type::STRING), string_piece_(piece) {}
 
+  ~JSONStringValue() override {
+    // Ugly hack that prevents ~Value() from trying to destroy string_value_.
+    // TODO(crbug.com/646113): Clean this up when StringValue will be removed.
+    type_ = Type::NONE;
+  }
+
   // Overridden from Value:
   bool GetAsString(std::string* out_value) const override {
     string_piece_.CopyToString(out_value);
     return true;
   }
   bool GetAsString(string16* out_value) const override {
     *out_value = UTF8ToUTF16(string_piece_);
     return true;
   }
+  // base::Value::GetAsString contains a proper implementation now, so the old
+  // behavior is copied here.
+  // TODO(crbug.com/646113): Clean this up when StringValue will be removed.
+  bool GetAsString(const StringValue** out_value) const override {
+    return false;
+  }
   bool GetAsString(StringPiece* out_value) const override {
     *out_value = string_piece_;
     return true;
   }
   Value* DeepCopy() const override { return new StringValue(string_piece_); }
   bool Equals(const Value* other) const override {
     std::string other_string;
     return other->IsType(Type::STRING) && other->GetAsString(&other_string) &&
            StringPiece(other_string) == string_piece_;
   }
@@ skipping 829 matching lines @@
                                            const std::string& description) {
   if (line || column) {
     return StringPrintf("Line: %i, column: %i, %s",
         line, column, description.c_str());
   }
   return description;
 }
 
 }  // namespace internal
 }  // namespace base