Merge Webkit at r70949: Initial merge by git.

Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e

1 files changed, 11 insertions, 0 deletions

diff --git a/WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp b/WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp
index a0b4058..c3af543 100644
--- a/WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp
+++ b/WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp
@@ -52,8 +52,13 @@ static void didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, WK
     State* state = reinterpret_cast<State*>(const_cast<void*>(clientInfo));
     TEST_ASSERT(state->didDecidePolicyForNavigationAction);
     TEST_ASSERT(!state->didCommitLoadForFrame);
+
+    // The commited URL should be null.
+    TEST_ASSERT(!WKFrameCopyURL(frame));
+
     TEST_ASSERT(!state->didStartProvisionalLoadForFrame);
 
+
     state->didStartProvisionalLoadForFrame = true;
 }
 
@@ -63,6 +68,9 @@ static void didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
     TEST_ASSERT(state->didDecidePolicyForNavigationAction);
     TEST_ASSERT(state->didStartProvisionalLoadForFrame);
 
+    // The provisional URL should be null.
+    TEST_ASSERT(!WKFrameCopyProvisionalURL(frame));
+
     state->didCommitLoadForFrame = true;
 }
 
@@ -73,6 +81,9 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
     TEST_ASSERT(state->didStartProvisionalLoadForFrame);
     TEST_ASSERT(state->didCommitLoadForFrame);
 
+    // The provisional URL should be null.
+    TEST_ASSERT(!WKFrameCopyProvisionalURL(frame));
+
     test1Done = true;
 }