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

Unified Diff: net/test/base_test_server.cc

Issue 12209080: Cleanup: Remove deprecated base::Value methods from net. Use base::Value too. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 10 months 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
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/base_test_server.cc
===================================================================
--- net/test/base_test_server.cc (revision 181443)
+++ net/test/base_test_server.cc (working copy)
@@ -42,13 +42,13 @@
void GetCiphersList(int cipher, base::ListValue* values) {
if (cipher & BaseTestServer::SSLOptions::BULK_CIPHER_RC4)
- values->Append(base::Value::CreateStringValue("rc4"));
+ values->Append(new base::StringValue("rc4"));
if (cipher & BaseTestServer::SSLOptions::BULK_CIPHER_AES128)
- values->Append(base::Value::CreateStringValue("aes128"));
+ values->Append(new base::StringValue("aes128"));
if (cipher & BaseTestServer::SSLOptions::BULK_CIPHER_AES256)
- values->Append(base::Value::CreateStringValue("aes256"));
+ values->Append(new base::StringValue("aes256"));
if (cipher & BaseTestServer::SSLOptions::BULK_CIPHER_3DES)
- values->Append(base::Value::CreateStringValue("3des"));
+ values->Append(new base::StringValue("3des"));
}
} // namespace
@@ -136,7 +136,7 @@
return host_port_pair_;
}
-const DictionaryValue& BaseTestServer::server_data() const {
+const base::DictionaryValue& BaseTestServer::server_data() const {
DCHECK(started_);
DCHECK(server_data_.get());
return *server_data_;
@@ -259,14 +259,14 @@
bool BaseTestServer::ParseServerData(const std::string& server_data) {
VLOG(1) << "Server data: " << server_data;
base::JSONReader json_reader;
- scoped_ptr<Value> value(json_reader.ReadToValue(server_data));
- if (!value.get() || !value->IsType(Value::TYPE_DICTIONARY)) {
+ scoped_ptr<base::Value> value(json_reader.ReadToValue(server_data));
+ if (!value.get() || !value->IsType(base::Value::TYPE_DICTIONARY)) {
LOG(ERROR) << "Could not parse server data: "
<< json_reader.GetErrorMessage();
return false;
}
- server_data_.reset(static_cast<DictionaryValue*>(value.release()));
+ server_data_.reset(static_cast<base::DictionaryValue*>(value.release()));
int port = 0;
if (!server_data_->GetInteger("port", &port)) {
LOG(ERROR) << "Could not find port value";
@@ -361,7 +361,7 @@
<< " doesn't exist. Can't launch https server.";
return false;
}
- ssl_client_certs->Append(base::Value::CreateStringValue(it->value()));
+ ssl_client_certs->Append(new base::StringValue(it->value()));
}
if (ssl_client_certs->GetSize())
@@ -384,7 +384,7 @@
arguments->Set("https-record-resume", base::Value::CreateNullValue());
if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) {
arguments->Set("tls-intolerant",
- base::Value::CreateIntegerValue(ssl_options_.tls_intolerant));
+ new base::FundamentalValue(ssl_options_.tls_intolerant));
}
}
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698