summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 22:50:27 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 22:50:27 +0000
commitea5ef4c89bd17065f32e1f294d8b922a0735fd25 (patch)
tree530a4633c162b39a7149714d83b34a24ef1220e2 /net/spdy
parentabf7641841f0ade77b8339e3f1368c9f3ff711bd (diff)
downloadchromium_src-ea5ef4c89bd17065f32e1f294d8b922a0735fd25.zip
chromium_src-ea5ef4c89bd17065f32e1f294d8b922a0735fd25.tar.gz
chromium_src-ea5ef4c89bd17065f32e1f294d8b922a0735fd25.tar.bz2
Make net and ipc explicitly use the base namespace for Values.
They're currently relying on a using in values.h that we want to remove. I removed several usings in net for consistency. BUG= R=willchan@chromium.org Review URL: https://codereview.chromium.org/15662008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
-rw-r--r--net/spdy/spdy_header_block.cc8
-rw-r--r--net/spdy/spdy_network_transaction_spdy2_unittest.cc2
-rw-r--r--net/spdy/spdy_network_transaction_spdy3_unittest.cc2
-rw-r--r--net/spdy/spdy_session_pool.cc4
-rw-r--r--net/spdy/spdy_stream.cc21
5 files changed, 19 insertions, 18 deletions
diff --git a/net/spdy/spdy_header_block.cc b/net/spdy/spdy_header_block.cc
index c84753a..ecc22a4 100644
--- a/net/spdy/spdy_header_block.cc
+++ b/net/spdy/spdy_header_block.cc
@@ -9,16 +9,16 @@
namespace net {
-Value* SpdyHeaderBlockNetLogCallback(
+base::Value* SpdyHeaderBlockNetLogCallback(
const SpdyHeaderBlock* headers,
NetLog::LogLevel /* log_level */) {
- DictionaryValue* dict = new DictionaryValue();
- DictionaryValue* headers_dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
+ base::DictionaryValue* headers_dict = new base::DictionaryValue();
for (SpdyHeaderBlock::const_iterator it = headers->begin();
it != headers->end(); ++it) {
headers_dict->SetWithoutPathExpansion(
it->first,
- new StringValue(
+ new base::StringValue(
ShouldShowHttpHeaderValue(it->first) ? it->second : "[elided]"));
}
dict->Set("headers", headers_dict);
diff --git a/net/spdy/spdy_network_transaction_spdy2_unittest.cc b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
index d71cee2..379603e 100644
--- a/net/spdy/spdy_network_transaction_spdy2_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
@@ -3780,7 +3780,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, NetLog) {
net::NetLog::TYPE_SPDY_SESSION_SYN_STREAM,
net::NetLog::PHASE_NONE);
- ListValue* header_list;
+ base::ListValue* header_list;
ASSERT_TRUE(entries[pos].params.get());
ASSERT_TRUE(entries[pos].params->GetList("headers", &header_list));
diff --git a/net/spdy/spdy_network_transaction_spdy3_unittest.cc b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
index 13b372d..f0b7a12 100644
--- a/net/spdy/spdy_network_transaction_spdy3_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
@@ -4370,7 +4370,7 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, NetLog) {
net::NetLog::TYPE_SPDY_SESSION_SYN_STREAM,
net::NetLog::PHASE_NONE);
- ListValue* header_list;
+ base::ListValue* header_list;
ASSERT_TRUE(entries[pos].params.get());
ASSERT_TRUE(entries[pos].params->GetList("headers", &header_list));
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
index cda0102..499670e 100644
--- a/net/spdy/spdy_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -251,8 +251,8 @@ bool SpdySessionPool::RemoveFromSessionList(
return true;
}
-Value* SpdySessionPool::SpdySessionPoolInfoToValue() const {
- ListValue* list = new ListValue();
+base::Value* SpdySessionPool::SpdySessionPoolInfoToValue() const {
+ base::ListValue* list = new base::ListValue();
for (SpdySessionsMap::const_iterator it = sessions_.begin();
it != sessions_.end(); ++it) {
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index 9a144ce..190e175 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -21,22 +21,23 @@ namespace net {
namespace {
-Value* NetLogSpdyStreamErrorCallback(SpdyStreamId stream_id,
- int status,
- const std::string* description,
- NetLog::LogLevel /* log_level */) {
- DictionaryValue* dict = new DictionaryValue();
+base::Value* NetLogSpdyStreamErrorCallback(SpdyStreamId stream_id,
+ int status,
+ const std::string* description,
+ NetLog::LogLevel /* log_level */) {
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetInteger("stream_id", static_cast<int>(stream_id));
dict->SetInteger("status", status);
dict->SetString("description", *description);
return dict;
}
-Value* NetLogSpdyStreamWindowUpdateCallback(SpdyStreamId stream_id,
- int32 delta,
- int32 window_size,
- NetLog::LogLevel /* log_level */) {
- DictionaryValue* dict = new DictionaryValue();
+base::Value* NetLogSpdyStreamWindowUpdateCallback(
+ SpdyStreamId stream_id,
+ int32 delta,
+ int32 window_size,
+ NetLog::LogLevel /* log_level */) {
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetInteger("stream_id", stream_id);
dict->SetInteger("delta", delta);
dict->SetInteger("window_size", window_size);