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/test | |
| 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/test')
| -rw-r--r-- | chrome/test/ui_test_utils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index fca8beb..4a0ef2a 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -6,7 +6,7 @@ #include <vector> -#include "base/json_reader.h" +#include "base/json/json_reader.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" @@ -397,7 +397,7 @@ Value* ExecuteJavaScript(RenderViewHost* render_view_host, json.insert(0, "["); json.append("]"); - scoped_ptr<Value> root_val(JSONReader::Read(json, true)); + scoped_ptr<Value> root_val(base::JSONReader::Read(json, true)); if (!root_val->IsType(Value::TYPE_LIST)) return NULL; |