Index: third_party/WebKit/Source/core/testing/CallbackFunctionTest.cpp |
diff --git a/third_party/WebKit/Source/core/testing/CallbackFunctionTest.cpp b/third_party/WebKit/Source/core/testing/CallbackFunctionTest.cpp |
index 04a3d8cbf30704fee256e65205f858fe4b43d653..39ee02a8cbab11a387d8add75a7ab6a64419465f 100644 |
--- a/third_party/WebKit/Source/core/testing/CallbackFunctionTest.cpp |
+++ b/third_party/WebKit/Source/core/testing/CallbackFunctionTest.cpp |
@@ -5,11 +5,11 @@ |
#include "core/testing/CallbackFunctionTest.h" |
#include "bindings/core/v8/ScriptState.h" |
+#include "bindings/core/v8/TestCallback.h" |
+#include "bindings/core/v8/TestInterfaceCallback.h" |
+#include "bindings/core/v8/TestReceiverObjectCallback.h" |
+#include "bindings/core/v8/TestSequenceCallback.h" |
#include "bindings/core/v8/V8Binding.h" |
-#include "bindings/core/v8/V8TestCallback.h" |
-#include "bindings/core/v8/V8TestInterfaceCallback.h" |
-#include "bindings/core/v8/V8TestReceiverObjectCallback.h" |
-#include "bindings/core/v8/V8TestSequenceCallback.h" |
#include "core/html/HTMLDivElement.h" |
namespace blink { |
@@ -18,7 +18,7 @@ DEFINE_TRACE(CallbackFunctionTest) |
{ |
} |
-String CallbackFunctionTest::testCallback(ScriptState* scriptState, V8TestCallback* callback, const String& message1, const String& message2, ExceptionState& exceptionState) |
+String CallbackFunctionTest::testCallback(ScriptState* scriptState, TestCallback* callback, const String& message1, const String& message2, ExceptionState& exceptionState) |
{ |
ScriptWrappable* scriptWrappable; |
String returnValue; |
@@ -29,7 +29,7 @@ String CallbackFunctionTest::testCallback(ScriptState* scriptState, V8TestCallba |
return String("Error!"); |
} |
-void CallbackFunctionTest::testInterfaceCallback(ScriptState* scriptState, V8TestInterfaceCallback* callback, HTMLDivElement* divElement, ExceptionState& exceptionState) |
+void CallbackFunctionTest::testInterfaceCallback(ScriptState* scriptState, TestInterfaceCallback* callback, HTMLDivElement* divElement, ExceptionState& exceptionState) |
{ |
ScriptWrappable* scriptWrappable; |
@@ -37,13 +37,13 @@ void CallbackFunctionTest::testInterfaceCallback(ScriptState* scriptState, V8Tes |
return; |
} |
-void CallbackFunctionTest::testReceiverObjectCallback(ScriptState* scriptState, V8TestReceiverObjectCallback* callback, ExceptionState& exceptionState) |
+void CallbackFunctionTest::testReceiverObjectCallback(ScriptState* scriptState, TestReceiverObjectCallback* callback, ExceptionState& exceptionState) |
{ |
callback->call(scriptState, this, exceptionState); |
return; |
} |
-Vector<String> CallbackFunctionTest::testSequenceCallback(ScriptState* scriptState, V8TestSequenceCallback* callback, const Vector<int>& numbers, ExceptionState& exceptionState) |
+Vector<String> CallbackFunctionTest::testSequenceCallback(ScriptState* scriptState, TestSequenceCallback* callback, const Vector<int>& numbers, ExceptionState& exceptionState) |
{ |
Vector<String> returnValue; |
if (callback->call(scriptState, nullptr, exceptionState, numbers, returnValue)) { |