summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkit_glue.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-09 21:02:31 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-09 21:02:31 +0000
commit30426c385b563f5014e81110b1f0d98c58100847 (patch)
tree274fb3dc5bad45f430b76b72e007f21edd600f9a /webkit/glue/webkit_glue.cc
parentf09d55d9bcd61359dc0fafcad4158d9946cd674e (diff)
downloadchromium_src-30426c385b563f5014e81110b1f0d98c58100847.zip
chromium_src-30426c385b563f5014e81110b1f0d98c58100847.tar.gz
chromium_src-30426c385b563f5014e81110b1f0d98c58100847.tar.bz2
net: Move the last two Escape() functions into the net namespace.
BUG=64263 TEST=None R=willchan@chromium.org Review URL: http://codereview.chromium.org/8507011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109298 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.cc')
-rw-r--r--webkit/glue/webkit_glue.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 67ee630..eca71dc 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -45,9 +45,9 @@
#if defined(OS_WIN)
#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h"
#endif
+#include "v8/include/v8.h"
#include "webkit/glue/glue_serialize.h"
#include "webkit/glue/user_agent.h"
-#include "v8/include/v8.h"
using WebKit::WebCanvas;
using WebKit::WebData;
@@ -215,7 +215,7 @@ static std::string DumpHistoryItem(const WebHistoryItem& item,
url.replace(0, pos + kLayoutTestsPatternSize, kFileTestPrefix);
} else if (url.find(kDataUrlPattern) == 0) {
// URL-escape data URLs to match results upstream.
- std::string path = EscapePath(url.substr(kDataUrlPatternSize));
+ std::string path = net::EscapePath(url.substr(kDataUrlPatternSize));
url.replace(kDataUrlPatternSize, url.length(), path);
}