Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Unified Diff: net/test/spawned_test_server/local_test_server.cc

Issue 2539363004: Make base::Value::TYPE a scoped enum. (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/test/spawned_test_server/local_test_server.cc
diff --git a/net/test/spawned_test_server/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc
index 302116672498b91dd87379f35f4d92dfb3fdd0c1..70ea7a9450cacb95e8282c7a8a756d260a439485 100644
--- a/net/test/spawned_test_server/local_test_server.cc
+++ b/net/test/spawned_test_server/local_test_server.cc
@@ -25,17 +25,17 @@ bool AppendArgumentFromJSONValue(const std::string& key,
base::CommandLine* command_line) {
std::string argument_name = "--" + key;
switch (value_node.GetType()) {
- case base::Value::TYPE_NULL:
+ case base::Value::Type::NONE:
command_line->AppendArg(argument_name);
break;
- case base::Value::TYPE_INTEGER: {
+ case base::Value::Type::INTEGER: {
int value;
bool result = value_node.GetAsInteger(&value);
DCHECK(result);
command_line->AppendArg(argument_name + "=" + base::IntToString(value));
break;
}
- case base::Value::TYPE_STRING: {
+ case base::Value::Type::STRING: {
std::string value;
bool result = value_node.GetAsString(&value);
if (!result || value.empty())
@@ -43,11 +43,11 @@ bool AppendArgumentFromJSONValue(const std::string& key,
command_line->AppendArg(argument_name + "=" + value);
break;
}
- case base::Value::TYPE_BOOLEAN:
- case base::Value::TYPE_DOUBLE:
- case base::Value::TYPE_LIST:
- case base::Value::TYPE_DICTIONARY:
- case base::Value::TYPE_BINARY:
+ case base::Value::Type::BOOLEAN:
+ case base::Value::Type::DOUBLE:
+ case base::Value::Type::LIST:
+ case base::Value::Type::DICTIONARY:
+ case base::Value::Type::BINARY:
default:
NOTREACHED() << "improper json type";
return false;
@@ -207,7 +207,7 @@ bool LocalTestServer::AddCommandLineArguments(
const std::string& key = it.key();
// Add arguments from a list.
- if (value.IsType(base::Value::TYPE_LIST)) {
+ if (value.IsType(base::Value::Type::LIST)) {
const base::ListValue* list = NULL;
if (!value.GetAsList(&list) || !list || list->empty())
return false;
« no previous file with comments | « net/test/spawned_test_server/base_test_server.cc ('k') | net/test/spawned_test_server/spawner_communicator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698