| Index: base/json/json_parser.cc
|
| diff --git a/base/json/json_parser.cc b/base/json/json_parser.cc
|
| index f1f43337c408663f68bde52856616a07b259638a..6b5026b6120f84ee9d70a71ced248478f4956c06 100644
|
| --- a/base/json/json_parser.cc
|
| +++ b/base/json/json_parser.cc
|
| @@ -37,7 +37,7 @@ class DictionaryHiddenRootValue : public base::DictionaryValue {
|
| DictionaryValue::Swap(static_cast<DictionaryValue*>(root));
|
| }
|
|
|
| - virtual void Swap(DictionaryValue* other) OVERRIDE {
|
| + void Swap(DictionaryValue* other) override {
|
| DVLOG(1) << "Swap()ing a DictionaryValue inefficiently.";
|
|
|
| // First deep copy to convert JSONStringValue to std::string and swap that
|
| @@ -55,8 +55,8 @@ class DictionaryHiddenRootValue : public base::DictionaryValue {
|
| // Not overriding DictionaryValue::Remove because it just calls through to
|
| // the method below.
|
|
|
| - virtual bool RemoveWithoutPathExpansion(const std::string& key,
|
| - scoped_ptr<Value>* out) OVERRIDE {
|
| + bool RemoveWithoutPathExpansion(const std::string& key,
|
| + scoped_ptr<Value>* out) override {
|
| // If the caller won't take ownership of the removed value, just call up.
|
| if (!out)
|
| return DictionaryValue::RemoveWithoutPathExpansion(key, out);
|
| @@ -87,7 +87,7 @@ class ListHiddenRootValue : public base::ListValue {
|
| ListValue::Swap(static_cast<ListValue*>(root));
|
| }
|
|
|
| - virtual void Swap(ListValue* other) OVERRIDE {
|
| + void Swap(ListValue* other) override {
|
| DVLOG(1) << "Swap()ing a ListValue inefficiently.";
|
|
|
| // First deep copy to convert JSONStringValue to std::string and swap that
|
| @@ -102,7 +102,7 @@ class ListHiddenRootValue : public base::ListValue {
|
| ListValue::Swap(copy.get());
|
| }
|
|
|
| - virtual bool Remove(size_t index, scoped_ptr<Value>* out) OVERRIDE {
|
| + bool Remove(size_t index, scoped_ptr<Value>* out) override {
|
| // If the caller won't take ownership of the removed value, just call up.
|
| if (!out)
|
| return ListValue::Remove(index, out);
|
| @@ -137,18 +137,18 @@ class JSONStringValue : public base::Value {
|
| }
|
|
|
| // Overridden from base::Value:
|
| - virtual bool GetAsString(std::string* out_value) const OVERRIDE {
|
| + bool GetAsString(std::string* out_value) const override {
|
| string_piece_.CopyToString(out_value);
|
| return true;
|
| }
|
| - virtual bool GetAsString(string16* out_value) const OVERRIDE {
|
| + bool GetAsString(string16* out_value) const override {
|
| *out_value = UTF8ToUTF16(string_piece_);
|
| return true;
|
| }
|
| - virtual Value* DeepCopy() const OVERRIDE {
|
| + Value* DeepCopy() const override {
|
| return new StringValue(string_piece_.as_string());
|
| }
|
| - virtual bool Equals(const Value* other) const OVERRIDE {
|
| + 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_;
|
|
|