Cleanup: Remove deprecated base::Value methods from net. Use base::Value too.

net/test/base_test_server.cc

 // Copyright 2013 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 "net/test/base_test_server.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 24 matching lines @@
     // Return a different hostname string that resolves to the same hostname.
     return "localhost";
   }
 
   // Use the 127.0.0.1 as default.
   return BaseTestServer::kLocalhost;
 }
 
 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
 
 BaseTestServer::SSLOptions::SSLOptions()
     : server_certificate(CERT_OK),
       ocsp_status(OCSP_OK),
       request_client_certificate(false),
       bulk_ciphers(SSLOptions::BULK_CIPHER_ANY),
       record_resume(false),
@@ skipping 67 matching lines @@
   Init(GetHostname(type, ssl_options));
 }
 
 BaseTestServer::~BaseTestServer() {}
 
 const HostPortPair& BaseTestServer::host_port_pair() const {
   DCHECK(started_);
   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_;
 }
 
 std::string BaseTestServer::GetScheme() const {
   switch (type_) {
     case TYPE_FTP:
       return "ftp";
     case TYPE_HTTP:
@@ skipping 102 matching lines @@
   // This method shouldn't get called twice.
   DCHECK(certificates_dir_.empty());
   document_root_ = document_root;
   certificates_dir_ = certificates_dir;
   DCHECK(!certificates_dir_.empty());
 }
 
 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";
     return false;
   }
   if ((port <= 0) || (port > kuint16max)) {
     LOG(ERROR) << "Invalid port value: " << port;
     return false;
   }
   host_port_pair_.set_port(port);
@@ skipping 74 matching lines @@
     scoped_ptr<base::ListValue> ssl_client_certs(new base::ListValue());
 
     std::vector<FilePath>::const_iterator it;
     for (it = ssl_options_.client_authorities.begin();
          it != ssl_options_.client_authorities.end(); ++it) {
       if (it->IsAbsolute() && !file_util::PathExists(*it)) {
         LOG(ERROR) << "Client authority path " << it->value()
                    << " 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())
       arguments->Set("ssl-client-ca", ssl_client_certs.release());
   }
 
   if (type_ == TYPE_HTTPS) {
     arguments->Set("https", base::Value::CreateNullValue());
 
     std::string ocsp_arg = ssl_options_.GetOCSPArgument();
     if (!ocsp_arg.empty())
       arguments->SetString("ocsp", ocsp_arg);
 
     // Check bulk cipher argument.
     scoped_ptr<base::ListValue> bulk_cipher_values(new base::ListValue());
     GetCiphersList(ssl_options_.bulk_ciphers, bulk_cipher_values.get());
     if (bulk_cipher_values->GetSize())
       arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release());
     if (ssl_options_.record_resume)
       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));
     }
   }
 
   return GenerateAdditionalArguments(arguments);
 }
 
 bool BaseTestServer::GenerateAdditionalArguments(
     base::DictionaryValue* arguments) const {
   return true;
 }
 
 }  // namespace net