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, 4 insertions, 2 deletions

diff --git a/chrome/common/web_resource/web_resource_unpacker.h b/chrome/common/web_resource/web_resource_unpacker.h
index d438826..4927c64 100644
--- a/chrome/common/web_resource/web_resource_unpacker.h
+++ b/chrome/common/web_resource/web_resource_unpacker.h
@@ -18,7 +18,9 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 
+namespace base {
 class DictionaryValue;
+}
 
 class WebResourceUnpacker {
  public:
@@ -36,7 +38,7 @@ class WebResourceUnpacker {
   const std::string& error_message() { return error_message_; }
 
   // Gets data which has been parsed by Run().
-  DictionaryValue* parsed_json() {
+  base::DictionaryValue* parsed_json() {
     return parsed_json_.get();
   }
 
@@ -45,7 +47,7 @@ class WebResourceUnpacker {
   std::string resource_data_;
 
   // Holds the result of JSON parsing of resource_data_.
-  scoped_ptr<DictionaryValue> parsed_json_;
+  scoped_ptr<base::DictionaryValue> parsed_json_;
 
   // Holds the last error message produced by Run().
   std::string error_message_;