Move base/values.h into the base namespace. This includes a cros DEPS roll

with a minor change to that code since libcros also uses base/values.h.

BUG=88666
TEST=none
Review URL: http://codereview.chromium.org/7259019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92208 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/net/test/test_server.h b/net/test/test_server.h
index 81b0ad3..5efd6ba 100644
--- a/net/test/test_server.h
+++ b/net/test/test_server.h
@@ -24,9 +24,12 @@
 #endif
 
 class CommandLine;
-class DictionaryValue;
 class GURL;
 
+namespace base {
+class DictionaryValue;
+}
+
 namespace net {
 
 class AddressList;
@@ -117,7 +120,7 @@ class TestServer {
 
   const FilePath& document_root() const { return document_root_; }
   const HostPortPair& host_port_pair() const;
-  const DictionaryValue& server_data() const;
+  const base::DictionaryValue& server_data() const;
   std::string GetScheme() const;
   bool GetAddressList(AddressList* address_list) const WARN_UNUSED_RESULT;
 
@@ -171,7 +174,7 @@ class TestServer {
   HostPortPair host_port_pair_;
 
   // Holds the data sent from the server (e.g., port number).
-  scoped_ptr<DictionaryValue> server_data_;
+  scoped_ptr<base::DictionaryValue> server_data_;
 
   // Handle of the Python process running the test server.
   base::ProcessHandle process_handle_;