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

2 files changed, 33 insertions, 27 deletions

diff --git a/net/disk_cache/mem_entry_impl.cc b/net/disk_cache/mem_entry_impl.cc
index dfd8ee6..7d00958 100644
--- a/net/disk_cache/mem_entry_impl.cc
+++ b/net/disk_cache/mem_entry_impl.cc
@@ -45,10 +45,11 @@ std::string GenerateChildName(const std::string& base_name, int child_id) {
 
 // Returns NetLog parameters for the creation of a child MemEntryImpl.  Separate
 // function needed because child entries don't suppport GetKey().
-Value* NetLogChildEntryCreationCallback(const disk_cache::MemEntryImpl* parent,
-                                        int child_id,
-                                        net::NetLog::LogLevel /* log_level */) {
-  DictionaryValue* dict = new DictionaryValue();
+base::Value* NetLogChildEntryCreationCallback(
+    const disk_cache::MemEntryImpl* parent,
+    int child_id,
+    net::NetLog::LogLevel /* log_level */) {
+  base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetString("key", GenerateChildName(parent->GetKey(), child_id));
   dict->SetBoolean("created", true);
   return dict;
diff --git a/net/disk_cache/net_log_parameters.cc b/net/disk_cache/net_log_parameters.cc
index 74ac2a2..5d7e50f 100644
--- a/net/disk_cache/net_log_parameters.cc
+++ b/net/disk_cache/net_log_parameters.cc
@@ -13,21 +13,23 @@
 
 namespace {
 
-Value* NetLogEntryCreationCallback(const disk_cache::Entry* entry,
-                                   bool created,
-                                   net::NetLog::LogLevel /* log_level */) {
-  DictionaryValue* dict = new DictionaryValue();
+base::Value* NetLogEntryCreationCallback(
+    const disk_cache::Entry* entry,
+    bool created,
+    net::NetLog::LogLevel /* log_level */) {
+  base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetString("key", entry->GetKey());
   dict->SetBoolean("created", created);
   return dict;
 }
 
-Value* NetLogReadWriteDataCallback(int index,
-                                   int offset,
-                                   int buf_len,
-                                   bool truncate,
-                                   net::NetLog::LogLevel /* log_level */) {
-  DictionaryValue* dict = new DictionaryValue();
+base::Value* NetLogReadWriteDataCallback(
+    int index,
+    int offset,
+    int buf_len,
+    bool truncate,
+    net::NetLog::LogLevel /* log_level */) {
+  base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetInteger("index", index);
   dict->SetInteger("offset", offset);
   dict->SetInteger("buf_len", buf_len);
@@ -36,10 +38,11 @@ Value* NetLogReadWriteDataCallback(int index,
   return dict;
 }
 
-Value* NetLogReadWriteCompleteCallback(int bytes_copied,
-                                       net::NetLog::LogLevel /* log_level */) {
+base::Value* NetLogReadWriteCompleteCallback(
+    int bytes_copied,
+    net::NetLog::LogLevel /* log_level */) {
   DCHECK_NE(bytes_copied, net::ERR_IO_PENDING);
-  DictionaryValue* dict = new DictionaryValue();
+  base::DictionaryValue* dict = new base::DictionaryValue();
   if (bytes_copied < 0) {
     dict->SetInteger("net_error", bytes_copied);
   } else {
@@ -48,10 +51,11 @@ Value* NetLogReadWriteCompleteCallback(int bytes_copied,
   return dict;
 }
 
-Value* NetLogSparseOperationCallback(int64 offset,
-                                     int buff_len,
-                                     net::NetLog::LogLevel /* log_level */) {
-  DictionaryValue* dict = new DictionaryValue();
+base::Value* NetLogSparseOperationCallback(
+    int64 offset,
+    int buff_len,
+    net::NetLog::LogLevel /* log_level */) {
+  base::DictionaryValue* dict = new base::DictionaryValue();
   // Values can only be created with at most 32-bit integers.  Using a string
   // instead circumvents that restriction.
   dict->SetString("offset", base::Int64ToString(offset));
@@ -59,20 +63,21 @@ Value* NetLogSparseOperationCallback(int64 offset,
   return dict;
 }
 
-Value* NetLogSparseReadWriteCallback(const net::NetLog::Source& source,
-                                     int child_len,
-                                     net::NetLog::LogLevel /* log_level */) {
-  DictionaryValue* dict = new DictionaryValue();
+base::Value* NetLogSparseReadWriteCallback(
+    const net::NetLog::Source& source,
+    int child_len,
+    net::NetLog::LogLevel /* log_level */) {
+  base::DictionaryValue* dict = new base::DictionaryValue();
   source.AddToEventParameters(dict);
   dict->SetInteger("child_len", child_len);
   return dict;
 }
 
-Value* NetLogGetAvailableRangeResultCallback(
+base::Value* NetLogGetAvailableRangeResultCallback(
     int64 start,
     int result,
     net::NetLog::LogLevel /* log_level */) {
-  DictionaryValue* dict = new DictionaryValue();
+  base::DictionaryValue* dict = new base::DictionaryValue();
   if (result > 0) {
     dict->SetInteger("length", result);
     dict->SetString("start",  base::Int64ToString(start));