| Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| index 7cf7d26aa896954080f9615aedf1a4eb2d842441..dad0f585f1c86edd30f5ada2f32b6156a787febb 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| @@ -4175,7 +4175,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadWhileProvisional) {
|
| webViewHelper.webView()->mainFrame()->dataSource();
|
| ASSERT_TRUE(dataSource);
|
| EXPECT_EQ(toKURL(m_baseURL + "fixed_layout.html"),
|
| - KURL(dataSource->request().url()));
|
| + KURL(dataSource->getRequest().url()));
|
| }
|
|
|
| TEST_P(ParameterizedWebFrameTest, AppendRedirects) {
|
| @@ -7000,7 +7000,7 @@ TEST_P(ParameterizedWebFrameTest, BackToReload) {
|
|
|
| FrameTestHelpers::reloadFrame(frame);
|
| EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
|
| - frame->dataSource()->request().getCachePolicy());
|
| + frame->dataSource()->getRequest().getCachePolicy());
|
| }
|
|
|
| TEST_P(ParameterizedWebFrameTest, BackDuringChildFrameReload) {
|
| @@ -7047,11 +7047,11 @@ TEST_P(ParameterizedWebFrameTest, ReloadPost) {
|
| FrameTestHelpers::pumpPendingRequestsForFrameToLoad(
|
| webViewHelper.webView()->mainFrame());
|
| EXPECT_EQ(WebString::fromUTF8("POST"),
|
| - frame->dataSource()->request().httpMethod());
|
| + frame->dataSource()->getRequest().httpMethod());
|
|
|
| FrameTestHelpers::reloadFrame(frame);
|
| EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
|
| - frame->dataSource()->request().getCachePolicy());
|
| + frame->dataSource()->getRequest().getCachePolicy());
|
| EXPECT_EQ(WebNavigationTypeFormResubmitted,
|
| frame->dataSource()->navigationType());
|
| }
|
| @@ -7077,7 +7077,7 @@ TEST_P(ParameterizedWebFrameTest, LoadHistoryItemReload) {
|
| WebCachePolicy::ValidatingCacheData);
|
| EXPECT_EQ(firstItem.get(), mainFrameLoader.currentItem());
|
| EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
|
| - frame->dataSource()->request().getCachePolicy());
|
| + frame->dataSource()->getRequest().getCachePolicy());
|
| }
|
|
|
| class TestCachePolicyWebFrameClient
|
| @@ -8339,7 +8339,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadBypassingCache) {
|
| WebFrame* frame = webViewHelper.webView()->mainFrame();
|
| FrameTestHelpers::reloadFrameBypassingCache(frame);
|
| EXPECT_EQ(WebCachePolicy::BypassingCache,
|
| - frame->dataSource()->request().getCachePolicy());
|
| + frame->dataSource()->getRequest().getCachePolicy());
|
| }
|
|
|
| static void nodeImageTestValidation(const IntSize& referenceBitmapSize,
|
|
|