Move didUpdateTextOfFocusedElementByNonUserInput from WebViewClient to WebWidgetClient.

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

 /*
  * Copyright (C) 2011, 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 2696 matching lines @@
 
     // For oilpan we have to force a GC to ensure the event handlers have been removed when
     // checking below. We do a precise GC (collectAllGarbage does not scan the stack)
     // to ensure the div element dies. This is also why the Document is in a Persistent
     // since we want that to stay around.
     ThreadHeap::collectAllGarbage();
 
     EXPECT_FALSE(registry.hasEventHandlers(EventHandlerRegistry::ScrollEvent));
 }
 
-class NonUserInputTextUpdateWebViewClient : public FrameTestHelpers::TestWebViewClient {
+class NonUserInputTextUpdateWebWidgetClient: public FrameTestHelpers::TestWebWidgetClient {
 public:
-    NonUserInputTextUpdateWebViewClient() : m_textIsUpdated(false) { }
+    NonUserInputTextUpdateWebWidgetClient() : m_textIsUpdated(false) { }
 
     // WebWidgetClient methods
     void didUpdateTextOfFocusedElementByNonUserInput() override
     {
         m_textIsUpdated = true;
     }
 
     void reset()
     {
         m_textIsUpdated = false;
     }
 
     bool textIsUpdated() const
     {
         return m_textIsUpdated;
     }
 
 private:
     int m_textIsUpdated;
 };
 
 // This test verifies the text input flags are correctly exposed to script.
 TEST_F(WebViewTest, TextInputFlags)
 {
-    NonUserInputTextUpdateWebViewClient client;
     std::string url = m_baseURL + "text_input_flags.html";
     URLTestHelpers::registerMockedURLLoad(toKURL(url), "text_input_flags.html");
-    WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true, 0, &client);
+    WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true);
     webViewImpl->setInitialFocus(false);
 
     WebLocalFrameImpl* frame = webViewImpl->mainFrameImpl();
     Document* document = frame->frame()->document();
 
     // (A) <input>
     // (A.1) Verifies autocorrect/autocomplete/spellcheck flags are Off and
     // autocapitalize is set to none.
     HTMLInputElement* inputElement = toHTMLInputElement(document->getElementById("input"));
     document->setFocusedElement(inputElement, FocusParams(SelectionBehaviorOnFocus::None, WebFocusTypeNone, nullptr));
@@ skipping 26 matching lines @@
     EXPECT_FALSE(info2.equals(info3));
 
     // Free the webView before freeing the NonUserInputTextUpdateWebViewClient.
     m_webViewHelper.reset();
 }
 
 // This test verifies that WebWidgetClient::didUpdateTextOfFocusedElementByNonUserInput is
 // called iff value of a focused element is modified via script.
 TEST_F(WebViewTest, NonUserInputTextUpdate)
 {
-    NonUserInputTextUpdateWebViewClient client;
+    NonUserInputTextUpdateWebWidgetClient client;
     std::string url = m_baseURL + "non_user_input_text_update.html";
     URLTestHelpers::registerMockedURLLoad(toKURL(url), "non_user_input_text_update.html");
-    WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true, 0, &client);
+    WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true, nullptr, nullptr, &client);
     webViewImpl->setInitialFocus(false);
 
     WebLocalFrameImpl* frame = webViewImpl->mainFrameImpl();
     Document* document = frame->frame()->document();
 
     // (A) <input>
     // (A.1) Focused and value is changed by script.
     client.reset();
     EXPECT_FALSE(client.textIsUpdated());
 
@@ skipping 557 matching lines @@
             EXPECT_TRUE(webView->page()->defersLoading());
         }
 
         EXPECT_TRUE(webView->page()->defersLoading());
     }
 
     EXPECT_FALSE(webView->page()->defersLoading());
 }
 
 } // namespace blink