Merge WebKit at r65072: String class has moved to the WTF namespace.

See http://trac.webkit.org/changeset/65021

Change-Id: I779a8ec0c3e1e0aed8f8d1894cfc1e5ca33ee549

1 files changed, 3 insertions, 3 deletions

diff --git a/WebKit/android/jni/GeolocationPermissionsBridge.cpp b/WebKit/android/jni/GeolocationPermissionsBridge.cpp
index a9f79b0..f623718 100755
--- a/WebKit/android/jni/GeolocationPermissionsBridge.cpp
+++ b/WebKit/android/jni/GeolocationPermissionsBridge.cpp
@@ -59,19 +59,19 @@ static jobject getOrigins(JNIEnv* env, jobject obj)
 
 static bool getAllowed(JNIEnv* env, jobject obj, jstring origin)
 {
-    WebCore::String originString = to_string(env, origin);
+    WTF::String originString = to_string(env, origin);
     return GeolocationPermissions::getAllowed(originString);
 }
 
 static void clear(JNIEnv* env, jobject obj, jstring origin)
 {
-    WebCore::String originString = to_string(env, origin);
+    WTF::String originString = to_string(env, origin);
     GeolocationPermissions::clear(originString);
 }
 
 static void allow(JNIEnv* env, jobject obj, jstring origin)
 {
-    WebCore::String originString = to_string(env, origin);
+    WTF::String originString = to_string(env, origin);
     GeolocationPermissions::allow(originString);
 }