diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 20:00:20 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 20:00:20 +0000 |
| commit | 93d49d70b89b22ec46d0b00b7950297f64865d56 (patch) | |
| tree | 3243e0209c738df0c18c2ba615667f757fcaec94 /chrome/common/web_resource | |
| parent | a9f607e33a91604bc63bd8c846aefbda9bf0dfa9 (diff) | |
| download | chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.zip chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.tar.gz chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.tar.bz2 | |
Move the json-related files into a separate json directory. This hopefully also
makes the naming of string_escape more clear (it's actually JSON-specific).
Move the files into the base namespace.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/316016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/web_resource')
| -rw-r--r-- | chrome/common/web_resource/web_resource_unpacker.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/web_resource/web_resource_unpacker.cc b/chrome/common/web_resource/web_resource_unpacker.cc index 7f0ced4..bbb14cf 100644 --- a/chrome/common/web_resource/web_resource_unpacker.cc +++ b/chrome/common/web_resource/web_resource_unpacker.cc @@ -4,7 +4,7 @@ #include "chrome/common/web_resource/web_resource_unpacker.h" -#include "base/json_reader.h" +#include "base/json/json_reader.h" #include "base/values.h" const char* WebResourceUnpacker::kInvalidDataTypeError = @@ -19,7 +19,7 @@ const char* WebResourceUnpacker::kUnexpectedJSONFormatError = bool WebResourceUnpacker::Run() { scoped_ptr<Value> value; if (!resource_data_.empty()) { - value.reset(JSONReader::Read(resource_data_, false)); + value.reset(base::JSONReader::Read(resource_data_, false)); if (!value.get()) { // Page information not properly read, or corrupted. error_message_ = kInvalidDataTypeError; |