Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849

* changes:
  Merge WebKit at r65072 : Update WebKit revision number.
  Merge WebKit at r65072 : Update test_expectations.
  Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
  Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
  Merge WebKit at r65072: JSC build fix in InspectorController.h
  Merge WebKit at r65072: Fix V8 code generator.
  Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
  Merge WebKit at r65072: String class has moved to the WTF namespace.
  Merge Webkit at r65072 : Fix conflicts.
  Merge Webkit at r65072 : Fix Makefiles.
  Merge WebKit at r65072 : Initial merge by git.

1 files changed, 4 insertions, 4 deletions

diff --git a/WebKit/android/jni/WebCoreJni.cpp b/WebKit/android/jni/WebCoreJni.cpp
index 73acb7b..a785f41 100644
--- a/WebKit/android/jni/WebCoreJni.cpp
+++ b/WebKit/android/jni/WebCoreJni.cpp
@@ -58,14 +58,14 @@ bool checkException(JNIEnv* env)
 }
 
 // This method is safe to call from the ui thread and the WebCore thread.
-WebCore::String to_string(JNIEnv* env, jstring str)
+WTF::String to_string(JNIEnv* env, jstring str)
 {
     if (!str || !env)
-        return WebCore::String();
+        return WTF::String();
     const jchar* s = env->GetStringChars(str, NULL);
     if (!s)
-        return WebCore::String();
-    WebCore::String ret(s, env->GetStringLength(str));
+        return WTF::String();
+    WTF::String ret(s, env->GetStringLength(str));
     env->ReleaseStringChars(str, s);
     checkException(env);
     return ret;