Change all test cases to use WebViewBase instead of WebViewImpl.

third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #include "core/exported/WebViewBase.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/page/Page.h"
 #include "core/page/ScopedPageSuspender.h"
 #include "public/platform/WebInputEvent.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebLocalFrame.h"
 #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 easier to see

[slangley, 2017/05/04 09:15:34]

Will keep it in mind.

 }
 
 namespace {
 
 class TestWebViewClient : public FrameTestHelpers::TestWebViewClient {
  public:
   explicit TestWebViewClient(WebNavigationPolicy* target) : target_(target) {}
   ~TestWebViewClient() override {}
 
   void Show(WebNavigationPolicy policy) override { *target_ = policy; }
 
  private:
   WebNavigationPolicy* target_;
 };
 
 }  // anonymous namespace
 
 class GetNavigationPolicyTest : public testing::Test {
  public:
   GetNavigationPolicyTest()
       : result_(kWebNavigationPolicyIgnore), web_view_client_(&result_) {}
 
  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_ =
         ToChromeClientImpl(&web_view_->GetPage()->GetChromeClient());
     result_ = kWebNavigationPolicyIgnore;
   }
 
   void TearDown() override { web_view_->Close(); }
 
   WebNavigationPolicy GetNavigationPolicyWithMouseEvent(
@@ skipping 11 matching lines @@
   }
 
   bool IsNavigationPolicyPopup() {
     chrome_client_impl_->Show(kNavigationPolicyIgnore);
     return result_ == kWebNavigationPolicyNewPopup;
   }
 
  protected:
   WebNavigationPolicy result_;
   TestWebViewClient web_view_client_;
-  WebViewImpl* web_view_;
+  WebViewBase* web_view_;
   FrameTestHelpers::TestWebFrameClient web_frame_client_;
   Persistent<ChromeClientImpl> chrome_client_impl_;
 };
 
 TEST_F(GetNavigationPolicyTest, LeftClick) {
   int modifiers = 0;
   WebMouseEvent::Button button = WebMouseEvent::Button::kLeft;
   bool as_popup = false;
   EXPECT_EQ(kWebNavigationPolicyNewForegroundTab,
             GetNavigationPolicyWithMouseEvent(modifiers, button, as_popup));
@@ skipping 128 matching lines @@
     return web_view_helper_.InitializeWithOpener(opener, true);
   }
 
  private:
   FrameTestHelpers::WebViewHelper web_view_helper_;
 };
 
 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_);
     chrome_client_impl_ =
         ToChromeClientImpl(&web_view_->GetPage()->GetChromeClient());
   }
 
   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_;
 };
 
 TEST_F(CreateWindowTest, CreateWindowFromSuspendedPage) {
   ScopedPageSuspender suspender;
   LocalFrame* frame = ToWebLocalFrameImpl(main_frame_)->GetFrame();
   FrameLoadRequest request(frame->GetDocument());
   WindowFeatures features;
   EXPECT_EQ(nullptr,
             chrome_client_impl_->CreateWindow(
                 frame, request, features, kNavigationPolicyNewForegroundTab));
 }
 
 }  // namespace blink