commit 5566d94c96ca038b931e8e34f3730a7d58010e13
author jdoerrie <jdoerrie@chromium.org> Mon Mar 06 03:12:04 2017 -0800
committer Commit bot <commit-bot@chromium.org> Mon Mar 06 11:12:04 2017 +0000
tree d43a5fa9c950e3ea8e983b5b9643e9edfd16c912
parent d88d9692bf7da1da751d3d409a1ac5f1ae26e75b

Remove base::StringValue

As a follow-up to typedeffing base::StringValue to base::Value in
http://crrev.com/2516363005 this change replaces all references to
base::StringValue by base::Value.

TBR=stevenjb@chromium.org
BUG=646113

Review-Url: https://codereview.chromium.org/2664753002
Cr-Original-Commit-Position: refs/heads/master@{#454848}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 122c4da76a70443fe965d1413741a79416a6e763

tools/gn/command_desc.cc

diff --git a/tools/gn/command_desc.cc b/tools/gn/command_desc.cc
index 1de9fbb..8e4ebd7 100644
--- a/tools/gn/command_desc.cc
+++ b/tools/gn/command_desc.cc
@@ -85,7 +85,7 @@
   const base::ListValue* list;
   if (value->GetAsList(&list)) {
     if (list->empty()) {
-      base::StringValue str("(no visibility)");
+      base::Value str("(no visibility)");
       DefaultHandler(name, &str);
     } else {
       DefaultHandler(name, value);
@@ -97,7 +97,7 @@
   std::string p;
   if (value->GetAsString(&p)) {
     if (p == "*") {
-      base::StringValue str("[All headers listed in the sources are public.]");
+      base::Value str("[All headers listed in the sources are public.]");
       DefaultHandler(name, &str);
       return;
     }

tools/gn/desc_builder.cc

diff --git a/tools/gn/desc_builder.cc b/tools/gn/desc_builder.cc
index a1a5710..c04fad6 100644
--- a/tools/gn/desc_builder.cc
+++ b/tools/gn/desc_builder.cc
@@ -123,17 +123,17 @@
 
   ValuePtr RenderValue(const std::string& s, bool optional = false) {
     return (s.empty() && optional) ? base::Value::CreateNullValue()
-                                   : ValuePtr(new base::StringValue(s));
+                                   : ValuePtr(new base::Value(s));
   }
 
   ValuePtr RenderValue(const SourceDir& d) {
     return d.is_null() ? base::Value::CreateNullValue()
-                       : ValuePtr(new base::StringValue(FormatSourceDir(d)));
+                       : ValuePtr(new base::Value(FormatSourceDir(d)));
   }
 
   ValuePtr RenderValue(const SourceFile& f) {
     return f.is_null() ? base::Value::CreateNullValue()
-                       : ValuePtr(new base::StringValue(f.value()));
+                       : ValuePtr(new base::Value(f.value()));
   }
 
   ValuePtr RenderValue(const LibFile& lib) {
@@ -679,7 +679,7 @@
         // Indent string values in blame mode
         if (blame_ && rendered->GetAsString(&str)) {
           str = "  " + str;
-          rendered = base::MakeUnique<base::StringValue>(str);
+          rendered = base::MakeUnique<base::Value>(str);
         }
         res->Append(std::move(rendered));
       }