summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 21:35:57 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 21:35:57 +0000
commite3cbe1f67d4ec787708781fd492868567b2cd549 (patch)
treed1cc6e4bae29ef38ef9be68ecdcef0901bbfa194 /webkit/support
parent80e34f5c0d2074f3c3516664128827f220bc4170 (diff)
downloadchromium_src-e3cbe1f67d4ec787708781fd492868567b2cd549.zip
chromium_src-e3cbe1f67d4ec787708781fd492868567b2cd549.tar.gz
chromium_src-e3cbe1f67d4ec787708781fd492868567b2cd549.tar.bz2
wstring: use ASCII path for WebKit root directory
This path is only used for layout tests. BUG=69467 Review URL: http://codereview.chromium.org/6628066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
-rw-r--r--webkit/support/webkit_support.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 2d994af..83fae0c 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -312,7 +312,9 @@ WebKit::WebApplicationCacheHost* CreateApplicationCacheHost(
WebKit::WebString GetWebKitRootDir() {
FilePath path = GetWebKitRootDirFilePath();
- return WebKit::WebString::fromUTF8(WideToUTF8(path.ToWStringHack()).c_str());
+ std::string path_ascii = path.MaybeAsASCII();
+ CHECK(!path_ascii.empty());
+ return WebKit::WebString::fromUTF8(path_ascii.c_str());
}
void SetUpGLBindings(GLBindingPreferences bindingPref) {