Index: third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp |
diff --git a/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp b/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp |
index b6714a2aa37a4c261eebf32f97dbfe5bd8aab295..4c26b5e7ad1d8a69332448bab9acf22da17c5778 100644 |
--- a/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp |
+++ b/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp |
@@ -38,13 +38,14 @@ |
#include "public/web/WebView.h" |
#include "public/web/WebViewClient.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+#include "web/ChromeClientImpl.h" |
#include "web/WebLocalFrameImpl.h" |
#include "web/tests/FrameTestHelpers.h" |
namespace blink { |
void SetCurrentInputEventForTest(const WebInputEvent* event) { |
- WebViewImpl::current_input_event_ = event; |
+ WebViewBase::SetCurrentInputEventForTest(event); |
sashab
2017/05/03 04:34:18
Maybe next time do this in a separate patch so its
slangley
2017/05/04 09:15:34
Will keep it in mind.
|
} |
namespace { |
@@ -69,8 +70,8 @@ class GetNavigationPolicyTest : public testing::Test { |
protected: |
void SetUp() override { |
- web_view_ = ToWebViewImpl( |
- WebView::Create(&web_view_client_, kWebPageVisibilityStateVisible)); |
+ web_view_ = |
+ WebViewBase::Create(&web_view_client_, kWebPageVisibilityStateVisible); |
web_view_->SetMainFrame(WebLocalFrame::Create( |
WebTreeScopeType::kDocument, &web_frame_client_, nullptr, nullptr)); |
chrome_client_impl_ = |
@@ -102,7 +103,7 @@ class GetNavigationPolicyTest : public testing::Test { |
protected: |
WebNavigationPolicy result_; |
TestWebViewClient web_view_client_; |
- WebViewImpl* web_view_; |
+ WebViewBase* web_view_; |
FrameTestHelpers::TestWebFrameClient web_frame_client_; |
Persistent<ChromeClientImpl> chrome_client_impl_; |
}; |
@@ -251,8 +252,8 @@ class ViewCreatingClient : public FrameTestHelpers::TestWebViewClient { |
class CreateWindowTest : public testing::Test { |
protected: |
void SetUp() override { |
- web_view_ = ToWebViewImpl( |
- WebView::Create(&web_view_client_, kWebPageVisibilityStateVisible)); |
+ web_view_ = |
+ WebViewBase::Create(&web_view_client_, kWebPageVisibilityStateVisible); |
main_frame_ = WebLocalFrame::Create(WebTreeScopeType::kDocument, |
&web_frame_client_, nullptr, nullptr); |
web_view_->SetMainFrame(main_frame_); |
@@ -263,7 +264,7 @@ class CreateWindowTest : public testing::Test { |
void TearDown() override { web_view_->Close(); } |
ViewCreatingClient web_view_client_; |
- WebViewImpl* web_view_; |
+ WebViewBase* web_view_; |
WebLocalFrame* main_frame_; |
FrameTestHelpers::TestWebFrameClient web_frame_client_; |
Persistent<ChromeClientImpl> chrome_client_impl_; |