libaddressinput - reduce number of copies in storage class by 2

base/values.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/values.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <ostream>
@@ skipping 116 matching lines @@
 }
 
 bool Value::GetAsString(std::string* out_value) const {
   return false;
 }
 
 bool Value::GetAsString(string16* out_value) const {
   return false;
 }
 
+bool Value::GetAsStringValue(const StringValue** out_value) const {
+  return false;
+}
+
 bool Value::GetAsList(ListValue** out_value) {
   return false;
 }
 
 bool Value::GetAsList(const ListValue** out_value) const {
   return false;
 }
 
 bool Value::GetAsDictionary(DictionaryValue** out_value) {
   return false;
@@ skipping 112 matching lines @@
     default:
       NOTREACHED();
       return false;
   }
 }
 
 ///////////////////// StringValue ////////////////////
 
 StringValue::StringValue(const std::string& in_value)
     : Value(TYPE_STRING),
-      value_(in_value) {
+      value_(new std::string(in_value)) {
   DCHECK(IsStringUTF8(in_value));
 }
 
 StringValue::StringValue(const string16& in_value)
     : Value(TYPE_STRING),
-      value_(UTF16ToUTF8(in_value)) {
-}
+      value_(new std::string(UTF16ToUTF8(in_value))) {}
 
-StringValue::~StringValue() {
-}
+StringValue::StringValue(scoped_ptr<std::string> in_value)
+    : Value(TYPE_STRING),
+      value_(in_value.Pass()) {}
+
+StringValue::~StringValue() {}
 
 bool StringValue::GetAsString(std::string* out_value) const {
   if (out_value)
-    *out_value = value_;
+    *out_value = *value_;
   return true;
 }
 
 bool StringValue::GetAsString(string16* out_value) const {
   if (out_value)
-    *out_value = UTF8ToUTF16(value_);
+    *out_value = UTF8ToUTF16(*value_);
+  return true;
+}
+
+bool StringValue::GetAsStringValue(const StringValue** out_value) const {
+  if (out_value)
+    *out_value = this;
   return true;
 }
 
 StringValue* StringValue::DeepCopy() const {
-  return CreateStringValue(value_);
+  return new StringValue(*value_);
 }
 
 bool StringValue::Equals(const Value* other) const {
   if (other->GetType() != GetType())
     return false;
   std::string lhs, rhs;
   return GetAsString(&lhs) && other->GetAsString(&rhs) && lhs == rhs;
 }
 
 ///////////////////// BinaryValue ////////////////////
@@ skipping 827 matching lines @@
 
 std::ostream& operator<<(std::ostream& out, const Value& value) {
   std::string json;
   JSONWriter::WriteWithOptions(&value,
                                JSONWriter::OPTIONS_PRETTY_PRINT,
                                &json);
   return out << json;
 }
 
 }  // namespace base