Index: third_party/WebKit/Source/bindings/core/v8/ScriptStreamerTest.cpp |
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptStreamerTest.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptStreamerTest.cpp |
index c0bde6fc0521a4d553138d63fe090c101218b7e3..e6a6afe2976c458b870c1977a6627c23224fbd21 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptStreamerTest.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptStreamerTest.cpp |
@@ -11,6 +11,7 @@ |
#include "bindings/core/v8/V8Binding.h" |
#include "bindings/core/v8/V8BindingForTesting.h" |
#include "bindings/core/v8/V8ScriptRunner.h" |
+#include "core/dom/ClassicScript.h" |
#include "core/dom/Element.h" |
#include "core/dom/PendingScript.h" |
#include "core/frame/Settings.h" |
@@ -129,7 +130,7 @@ TEST_F(ScriptStreamingTest, CompilingStreamedScript) { |
EXPECT_TRUE(client->finished()); |
bool errorOccurred = false; |
ScriptSourceCode sourceCode = |
- getPendingScript()->getSource(KURL(), errorOccurred); |
+ getPendingScript()->getSource(KURL(), errorOccurred)->scriptSourceCode(); |
EXPECT_FALSE(errorOccurred); |
EXPECT_TRUE(sourceCode.streamer()); |
v8::TryCatch tryCatch(scope.isolate()); |
@@ -168,7 +169,7 @@ TEST_F(ScriptStreamingTest, CompilingStreamedScriptWithParseError) { |
bool errorOccurred = false; |
ScriptSourceCode sourceCode = |
- getPendingScript()->getSource(KURL(), errorOccurred); |
+ getPendingScript()->getSource(KURL(), errorOccurred)->scriptSourceCode(); |
EXPECT_FALSE(errorOccurred); |
EXPECT_TRUE(sourceCode.streamer()); |
v8::TryCatch tryCatch(scope.isolate()); |
@@ -234,7 +235,7 @@ TEST_F(ScriptStreamingTest, SuppressingStreaming) { |
bool errorOccurred = false; |
ScriptSourceCode sourceCode = |
- getPendingScript()->getSource(KURL(), errorOccurred); |
+ getPendingScript()->getSource(KURL(), errorOccurred)->scriptSourceCode(); |
EXPECT_FALSE(errorOccurred); |
// ScriptSourceCode doesn't refer to the streamer, since we have suppressed |
// the streaming and resumed the non-streaming code path for script |
@@ -261,7 +262,7 @@ TEST_F(ScriptStreamingTest, EmptyScripts) { |
bool errorOccurred = false; |
ScriptSourceCode sourceCode = |
- getPendingScript()->getSource(KURL(), errorOccurred); |
+ getPendingScript()->getSource(KURL(), errorOccurred)->scriptSourceCode(); |
EXPECT_FALSE(errorOccurred); |
EXPECT_FALSE(sourceCode.streamer()); |
} |
@@ -287,7 +288,7 @@ TEST_F(ScriptStreamingTest, SmallScripts) { |
bool errorOccurred = false; |
ScriptSourceCode sourceCode = |
- getPendingScript()->getSource(KURL(), errorOccurred); |
+ getPendingScript()->getSource(KURL(), errorOccurred)->scriptSourceCode(); |
EXPECT_FALSE(errorOccurred); |
EXPECT_FALSE(sourceCode.streamer()); |
} |
@@ -316,7 +317,7 @@ TEST_F(ScriptStreamingTest, ScriptsWithSmallFirstChunk) { |
EXPECT_TRUE(client->finished()); |
bool errorOccurred = false; |
ScriptSourceCode sourceCode = |
- getPendingScript()->getSource(KURL(), errorOccurred); |
+ getPendingScript()->getSource(KURL(), errorOccurred)->scriptSourceCode(); |
EXPECT_FALSE(errorOccurred); |
EXPECT_TRUE(sourceCode.streamer()); |
v8::TryCatch tryCatch(scope.isolate()); |
@@ -352,7 +353,7 @@ TEST_F(ScriptStreamingTest, EncodingChanges) { |
EXPECT_TRUE(client->finished()); |
bool errorOccurred = false; |
ScriptSourceCode sourceCode = |
- getPendingScript()->getSource(KURL(), errorOccurred); |
+ getPendingScript()->getSource(KURL(), errorOccurred)->scriptSourceCode(); |
EXPECT_FALSE(errorOccurred); |
EXPECT_TRUE(sourceCode.streamer()); |
v8::TryCatch tryCatch(scope.isolate()); |
@@ -388,7 +389,7 @@ TEST_F(ScriptStreamingTest, EncodingFromBOM) { |
EXPECT_TRUE(client->finished()); |
bool errorOccurred = false; |
ScriptSourceCode sourceCode = |
- getPendingScript()->getSource(KURL(), errorOccurred); |
+ getPendingScript()->getSource(KURL(), errorOccurred)->scriptSourceCode(); |
EXPECT_FALSE(errorOccurred); |
EXPECT_TRUE(sourceCode.streamer()); |
v8::TryCatch tryCatch(scope.isolate()); |