summaryrefslogtreecommitdiffstats
path: root/base/json
diff options
context:
space:
mode:
authorkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 02:53:55 +0000
committerkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 02:53:55 +0000
commit8814427f49396271ee260e44de0a8482f4ae2b76 (patch)
tree5a8bcd474fbba3e6aa9fa139d38f65150738a50b /base/json
parentf34e7963c796bda1eb7fd35f5eda0d878c2df4e6 (diff)
downloadchromium_src-8814427f49396271ee260e44de0a8482f4ae2b76.zip
chromium_src-8814427f49396271ee260e44de0a8482f4ae2b76.tar.gz
chromium_src-8814427f49396271ee260e44de0a8482f4ae2b76.tar.bz2
Revert 41789 - Add support for DOM interaction in browser tests via C++.
BUG=none TEST=none Review URL: http://codereview.chromium.org/660046 TBR=kkania@chromium.org Review URL: http://codereview.chromium.org/971004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41807 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json')
-rw-r--r--base/json/string_escape.cc12
-rw-r--r--base/json/string_escape.h7
2 files changed, 1 insertions, 18 deletions
diff --git a/base/json/string_escape.cc b/base/json/string_escape.cc
index 5bf0b86..4e1418c 100644
--- a/base/json/string_escape.cc
+++ b/base/json/string_escape.cc
@@ -82,22 +82,10 @@ void JsonDoubleQuote(const std::string& str,
JsonDoubleQuoteT(str, put_in_quotes, dst);
}
-std::string GetDoubleQuotedJson(const std::string& str) {
- std::string dst;
- JsonDoubleQuote(str, true, &dst);
- return dst;
-}
-
void JsonDoubleQuote(const string16& str,
bool put_in_quotes,
std::string* dst) {
JsonDoubleQuoteT(str, put_in_quotes, dst);
}
-std::string GetDoubleQuotedJson(const string16& str) {
- std::string dst;
- JsonDoubleQuote(str, true, &dst);
- return dst;
-}
-
} // namespace base
diff --git a/base/json/string_escape.h b/base/json/string_escape.h
index 7c64c29..7d74021 100644
--- a/base/json/string_escape.h
+++ b/base/json/string_escape.h
@@ -13,7 +13,7 @@
namespace base {
-// Escape |str| appropriately for a JSON string literal, _appending_ the
+// Escape |str| appropriately for a JSON string litereal, _appending_ the
// result to |dst|. This will create unicode escape sequences (\uXXXX).
// If |put_in_quotes| is true, the result will be surrounded in double quotes.
// The outputted literal, when interpreted by the browser, should result in a
@@ -22,15 +22,10 @@ void JsonDoubleQuote(const std::string& str,
bool put_in_quotes,
std::string* dst);
-// Same as above, but always returns the result double quoted.
-std::string GetDoubleQuotedJson(const std::string& str);
-
void JsonDoubleQuote(const string16& str,
bool put_in_quotes,
std::string* dst);
-// Same as above, but always returns the result double quoted.
-std::string GetDoubleQuotedJson(const string16& str);
} // namespace base