2 files changed, 2 insertions, 6 deletions
diff --git a/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp b/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
index 7aa55b5..3bb8e27 100644
--- a/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
+++ b/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
@@ -68,9 +68,7 @@ static NPClass JavaNPObjectClass = {
     0 // construct
 };
 
-// ANDROID-specific change. TODO: Upstream
-NPObject* JavaInstanceToNPObject(PassRefPtr<JavaInstance> instance)
-// END ANDROID-specific change
+NPObject* JavaInstanceToNPObject(JavaInstance* instance)
 {
     JavaNPObject* object = reinterpret_cast<JavaNPObject*>(_NPN_CreateObject(0, &JavaNPObjectClass));
     object->m_instance = instance;
diff --git a/WebCore/bridge/jni/v8/JavaNPObjectV8.h b/WebCore/bridge/jni/v8/JavaNPObjectV8.h
index e68a5aa..31b0ac7 100644
--- a/WebCore/bridge/jni/v8/JavaNPObjectV8.h
+++ b/WebCore/bridge/jni/v8/JavaNPObjectV8.h
@@ -41,9 +41,7 @@ struct JavaNPObject {
     RefPtr<JavaInstance> m_instance;
 };
 
-// ANDROID-specific change. TODO: Upstream
-NPObject* JavaInstanceToNPObject(PassRefPtr<JavaInstance>);
-// END ANDROID-specific change
+NPObject* JavaInstanceToNPObject(JavaInstance*);
 JavaInstance* ExtractJavaInstance(NPObject*);
 
 bool JavaNPObjectHasMethod(NPObject*, NPIdentifier name);