summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-23 22:23:08 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-23 22:23:08 +0000
commit4b3006f0ecb22cd179404810dc3580ccf5fa129d (patch)
tree84e36a40831bc716becc4e8df5729727b6fe8641 /net
parent85ecd7e2a7efe7fd05d1803412bfe46d8b3bd9d0 (diff)
downloadchromium_src-4b3006f0ecb22cd179404810dc3580ccf5fa129d.zip
chromium_src-4b3006f0ecb22cd179404810dc3580ccf5fa129d.tar.gz
chromium_src-4b3006f0ecb22cd179404810dc3580ccf5fa129d.tar.bz2
Update uses of Value in extensions/, google_apis/, gpu/, media/, net/, printing/, remoting/, rlz/, sync/, ui/ to use the base:: namespace.
BUG=88666 TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/116433007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/capturing_net_log.cc2
-rw-r--r--net/base/net_log_logger.cc22
-rw-r--r--net/http/transport_security_persister.cc24
-rw-r--r--net/spdy/spdy_header_block_unittest.cc2
-rw-r--r--net/test/spawned_test_server/local_test_server.cc4
-rw-r--r--net/tools/dns_fuzz_stub/dns_fuzz_stub.cc2
-rw-r--r--net/tools/gdig/file_net_log.cc2
-rw-r--r--net/url_request/url_request.cc4
8 files changed, 32 insertions, 30 deletions
diff --git a/net/base/capturing_net_log.cc b/net/base/capturing_net_log.cc
index c7c2516..ea17835 100644
--- a/net/base/capturing_net_log.cc
+++ b/net/base/capturing_net_log.cc
@@ -106,7 +106,7 @@ void CapturingNetLog::Observer::OnAddEntry(const net::NetLog::Entry& entry) {
// Using Dictionaries instead of Values makes checking values a little
// simpler.
base::DictionaryValue* param_dict = NULL;
- Value* param_value = entry.ParametersToValue();
+ base::Value* param_value = entry.ParametersToValue();
if (param_value && !param_value->GetAsDictionary(&param_dict))
delete param_value;
diff --git a/net/base/net_log_logger.cc b/net/base/net_log_logger.cc
index bd68bd5..0fcf417 100644
--- a/net/base/net_log_logger.cc
+++ b/net/base/net_log_logger.cc
@@ -52,7 +52,7 @@ void NetLogLogger::OnAddEntry(const net::NetLog::Entry& entry) {
// Add a comma and newline for every event but the first. Newlines are needed
// so can load partial log files by just ignoring the last line. For this to
// work, lines cannot be pretty printed.
- scoped_ptr<Value> value(entry.ToValue());
+ scoped_ptr<base::Value> value(entry.ToValue());
std::string json;
base::JSONWriter::Write(value.get(), &json);
fprintf(file_.get(), "%s%s",
@@ -62,7 +62,7 @@ void NetLogLogger::OnAddEntry(const net::NetLog::Entry& entry) {
}
base::DictionaryValue* NetLogLogger::GetConstants() {
- DictionaryValue* constants_dict = new DictionaryValue();
+ base::DictionaryValue* constants_dict = new base::DictionaryValue();
// Version of the file format.
constants_dict->SetInteger("logFormatVersion", kLogFormatVersion);
@@ -74,7 +74,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
// Add a dictionary with information about the relationship between load flag
// enums and their symbolic names.
{
- DictionaryValue* dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
#define LOAD_FLAG(label, value) \
dict->SetInteger(# label, static_cast<int>(value));
@@ -87,7 +87,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
// Add a dictionary with information about the relationship between load state
// enums and their symbolic names.
{
- DictionaryValue* dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
#define LOAD_STATE(label) \
dict->SetInteger(# label, net::LOAD_STATE_ ## label);
@@ -100,7 +100,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
// Add information on the relationship between net error codes and their
// symbolic names.
{
- DictionaryValue* dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
#define NET_ERROR(label, value) \
dict->SetInteger(# label, static_cast<int>(value));
@@ -113,7 +113,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
// Add information on the relationship between QUIC error codes and their
// symbolic names.
{
- DictionaryValue* dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
for (net::QuicErrorCode error = net::QUIC_NO_ERROR;
error < net::QUIC_LAST_ERROR;
@@ -128,7 +128,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
// Add information on the relationship between QUIC RST_STREAM error codes
// and their symbolic names.
{
- DictionaryValue* dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
for (net::QuicRstStreamErrorCode error = net::QUIC_STREAM_NO_ERROR;
error < net::QUIC_STREAM_LAST_ERROR;
@@ -143,7 +143,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
// Information about the relationship between event phase enums and their
// symbolic names.
{
- DictionaryValue* dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetInteger("PHASE_BEGIN", net::NetLog::PHASE_BEGIN);
dict->SetInteger("PHASE_END", net::NetLog::PHASE_END);
@@ -159,7 +159,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
// Information about the relationship between LogLevel enums and their
// symbolic names.
{
- DictionaryValue* dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetInteger("LOG_ALL", net::NetLog::LOG_ALL);
dict->SetInteger("LOG_ALL_BUT_BYTES", net::NetLog::LOG_ALL_BUT_BYTES);
@@ -171,7 +171,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
// Information about the relationship between address family enums and
// their symbolic names.
{
- DictionaryValue* dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetInteger("ADDRESS_FAMILY_UNSPECIFIED",
net::ADDRESS_FAMILY_UNSPECIFIED);
@@ -209,7 +209,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
// "clientInfo" key is required for some NetLogLogger log readers.
// Provide a default empty value for compatibility.
- constants_dict->Set("clientInfo", new DictionaryValue());
+ constants_dict->Set("clientInfo", new base::DictionaryValue());
return constants_dict;
}
diff --git a/net/http/transport_security_persister.cc b/net/http/transport_security_persister.cc
index 39ac8df..d93291f 100644
--- a/net/http/transport_security_persister.cc
+++ b/net/http/transport_security_persister.cc
@@ -26,14 +26,15 @@ using net::TransportSecurityState;
namespace {
-ListValue* SPKIHashesToListValue(const HashValueVector& hashes) {
- ListValue* pins = new ListValue;
+base::ListValue* SPKIHashesToListValue(const HashValueVector& hashes) {
+ base::ListValue* pins = new base::ListValue;
for (size_t i = 0; i != hashes.size(); i++)
- pins->Append(new StringValue(hashes[i].ToString()));
+ pins->Append(new base::StringValue(hashes[i].ToString()));
return pins;
}
-void SPKIHashesFromListValue(const ListValue& pins, HashValueVector* hashes) {
+void SPKIHashesFromListValue(const base::ListValue& pins,
+ HashValueVector* hashes) {
size_t num_pins = pins.GetSize();
for (size_t i = 0; i < num_pins; ++i) {
std::string type_and_base64;
@@ -137,7 +138,7 @@ void TransportSecurityPersister::StateIsDirty(
bool TransportSecurityPersister::SerializeData(std::string* output) {
DCHECK(foreground_runner_->RunsTasksOnCurrentThread());
- DictionaryValue toplevel;
+ base::DictionaryValue toplevel;
base::Time now = base::Time::Now();
TransportSecurityState::Iterator state(*transport_security_state_);
for (; state.HasNext(); state.Advance()) {
@@ -145,7 +146,7 @@ bool TransportSecurityPersister::SerializeData(std::string* output) {
const TransportSecurityState::DomainState& domain_state =
state.domain_state();
- DictionaryValue* serialized = new DictionaryValue;
+ base::DictionaryValue* serialized = new base::DictionaryValue;
serialized->SetBoolean(kStsIncludeSubdomains,
domain_state.sts_include_subdomains);
serialized->SetBoolean(kPkpIncludeSubdomains,
@@ -198,16 +199,17 @@ bool TransportSecurityPersister::LoadEntries(const std::string& serialized,
bool TransportSecurityPersister::Deserialize(const std::string& serialized,
bool* dirty,
TransportSecurityState* state) {
- scoped_ptr<Value> value(base::JSONReader::Read(serialized));
- DictionaryValue* dict_value = NULL;
+ scoped_ptr<base::Value> value(base::JSONReader::Read(serialized));
+ base::DictionaryValue* dict_value = NULL;
if (!value.get() || !value->GetAsDictionary(&dict_value))
return false;
const base::Time current_time(base::Time::Now());
bool dirtied = false;
- for (DictionaryValue::Iterator i(*dict_value); !i.IsAtEnd(); i.Advance()) {
- const DictionaryValue* parsed = NULL;
+ for (base::DictionaryValue::Iterator i(*dict_value);
+ !i.IsAtEnd(); i.Advance()) {
+ const base::DictionaryValue* parsed = NULL;
if (!i.value().GetAsDictionary(&parsed)) {
LOG(WARNING) << "Could not parse entry " << i.key() << "; skipping entry";
continue;
@@ -247,7 +249,7 @@ bool TransportSecurityPersister::Deserialize(const std::string& serialized,
parsed->GetDouble(kDynamicSPKIHashesExpiry,
&dynamic_spki_hashes_expiry);
- const ListValue* pins_list = NULL;
+ const base::ListValue* pins_list = NULL;
// preloaded_spki_hashes is a legacy synonym for static_spki_hashes.
if (parsed->GetList(kStaticSPKIHashes, &pins_list))
SPKIHashesFromListValue(*pins_list, &domain_state.static_spki_hashes);
diff --git a/net/spdy/spdy_header_block_unittest.cc b/net/spdy/spdy_header_block_unittest.cc
index 3cfef16..1b6b449d 100644
--- a/net/spdy/spdy_header_block_unittest.cc
+++ b/net/spdy/spdy_header_block_unittest.cc
@@ -18,7 +18,7 @@ TEST(SpdyHeaderBlockTest, ToNetLogParamAndBackAgain) {
headers["A"] = "a";
headers["B"] = "b";
- scoped_ptr<Value> event_param(
+ scoped_ptr<base::Value> event_param(
SpdyHeaderBlockNetLogCallback(&headers, NetLog::LOG_ALL_BUT_BYTES));
SpdyHeaderBlock headers2;
diff --git a/net/test/spawned_test_server/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc
index 8679d7b..7ee12b9 100644
--- a/net/test/spawned_test_server/local_test_server.cc
+++ b/net/test/spawned_test_server/local_test_server.cc
@@ -35,7 +35,7 @@ bool AppendArgumentFromJSONValue(const std::string& key,
command_line->AppendArg(argument_name + "=" + base::IntToString(value));
break;
}
- case Value::TYPE_STRING: {
+ case base::Value::TYPE_STRING: {
std::string value;
bool result = value_node.GetAsString(&value);
if (!result || value.empty())
@@ -210,7 +210,7 @@ bool LocalTestServer::AddCommandLineArguments(CommandLine* command_line) const {
const std::string& key = it.key();
// Add arguments from a list.
- if (value.IsType(Value::TYPE_LIST)) {
+ if (value.IsType(base::Value::TYPE_LIST)) {
const base::ListValue* list = NULL;
if (!value.GetAsList(&list) || !list || list->empty())
return false;
diff --git a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
index f9caa79..d77abee 100644
--- a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
+++ b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
@@ -58,7 +58,7 @@ bool ReadTestCase(const char* filename,
return false;
}
- scoped_ptr<Value> value(base::JSONReader::Read(json));
+ scoped_ptr<base::Value> value(base::JSONReader::Read(json));
if (!value.get()) {
LOG(ERROR) << filename << ": couldn't parse JSON.";
return false;
diff --git a/net/tools/gdig/file_net_log.cc b/net/tools/gdig/file_net_log.cc
index 7c755c8..5020f6d 100644
--- a/net/tools/gdig/file_net_log.cc
+++ b/net/tools/gdig/file_net_log.cc
@@ -27,7 +27,7 @@ void FileNetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) {
const char* source = NetLog::SourceTypeToString(entry.source().type);
const char* type = NetLog::EventTypeToString(entry.type());
- scoped_ptr<Value> param_value(entry.ParametersToValue());
+ scoped_ptr<base::Value> param_value(entry.ParametersToValue());
std::string params;
if (param_value.get() != NULL) {
JSONStringValueSerializer serializer(&params);
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index a037063..f9dec87 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -361,11 +361,11 @@ LoadStateWithParam URLRequest::GetLoadState() const {
}
base::Value* URLRequest::GetStateAsValue() const {
- DictionaryValue* dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetString("url", original_url().possibly_invalid_spec());
if (url_chain_.size() > 1) {
- ListValue* list = new ListValue();
+ base::ListValue* list = new base::ListValue();
for (std::vector<GURL>::const_iterator url = url_chain_.begin();
url != url_chain_.end(); ++url) {
list->AppendString(url->possibly_invalid_spec());