Define WebTextInputMode as a enum in the public API.

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 221 matching lines @@
                       const WebSize& maxAutoResize,
                       const std::string& pageWidth,
                       const std::string& pageHeight,
                       int expectedWidth,
                       int expectedHeight,
                       HorizontalScrollbarState expectedHorizontalState,
                       VerticalScrollbarState expectedVerticalState);
 
   void testTextInputType(WebTextInputType expectedType,
                          const std::string& htmlFile);
-  void testInputMode(const WebString& expectedInputMode,
+  void testInputMode(WebTextInputMode expectedInputMode,
                      const std::string& htmlFile);
   bool tapElement(WebInputEvent::Type, Element*);
   bool tapElementById(WebInputEvent::Type, const WebString& id);
 
   std::string m_baseURL;
   FrameTestHelpers::WebViewHelper m_webViewHelper;
 };
 
 static bool hitTestIsContentEditable(WebView* view, int x, int y) {
   WebPoint hitPoint(x, y);
@@ skipping 534 matching lines @@
   // Add id="foo" to <path>, thus triggering the condition described above.
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
   document->body()
       ->querySelector("path", ASSERT_NO_EXCEPTION)
       ->setIdAttribute("foo");
 
   // This should not DCHECK.
   EXPECT_EQ(WebTextInputTypeText, webViewImpl->textInputInfo().type);
 }
 
-void WebViewTest::testInputMode(const WebString& expectedInputMode,
+void WebViewTest::testInputMode(WebTextInputMode expectedInputMode,
                                 const std::string& htmlFile) {
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()),
       WebString::fromUTF8(htmlFile.c_str()));
   WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + htmlFile);
   webView->setInitialFocus(false);
   EXPECT_EQ(expectedInputMode, webView->textInputInfo().inputMode);
 }
 
 TEST_F(WebViewTest, InputMode) {
-  testInputMode(WebString(), "input_mode_default.html");
-  testInputMode(WebString("unknown"), "input_mode_default_unknown.html");
-  testInputMode(WebString("verbatim"), "input_mode_default_verbatim.html");
-  testInputMode(WebString("verbatim"), "input_mode_type_text_verbatim.html");
-  testInputMode(WebString("verbatim"), "input_mode_type_search_verbatim.html");
-  testInputMode(WebString(), "input_mode_type_url_verbatim.html");
-  testInputMode(WebString("verbatim"), "input_mode_textarea_verbatim.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeDefault,
+                "input_mode_default.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeDefault,
+                "input_mode_default_unknown.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeVerbatim,

[esprehn, 2016/10/24 21:12:26]

All of this seems like it should be unit tests inside blink, loading a whole
file on disk is super overkill for what's being tested.

+                "input_mode_default_verbatim.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeVerbatim,
+                "input_mode_type_text_verbatim.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeVerbatim,
+                "input_mode_type_search_verbatim.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeDefault,
+                "input_mode_type_url_verbatim.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeLatin,
+                "input_mode_type_latin.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeLatinName,
+                "input_mode_type_latin_name.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeLatinProse,
+                "input_mode_type_latin_prose.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeFullWidthLatin,
+                "input_mode_type_full_width_latin.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeKana,
+                "input_mode_type_kana.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeKanaName,
+                "input_mode_type_kana_name.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeKataKana,
+                "input_mode_type_kata_kana.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeNumeric,
+                "input_mode_type_numeric.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeTel,
+                "input_mode_type_tel.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeEmail,
+                "input_mode_type_email.html");
+  testInputMode(WebTextInputMode::kWebTextInputModeUrl,
+                "input_mode_type_url.html");
 }
 
 TEST_F(WebViewTest, TextInputInfoWithReplacedElements) {
   std::string url = m_baseURL + "div_with_image.html";
   URLTestHelpers::registerMockedURLLoad(toKURL(url), "div_with_image.html");
   URLTestHelpers::registerMockedURLLoad(toKURL("http://www.test.com/foo.png"),
                                         "white-1x1.png");
   WebView* webView = m_webViewHelper.initializeAndLoad(url);
   webView->setInitialFocus(false);
   WebTextInputInfo info = webView->textInputInfo();
@@ skipping 3305 matching lines @@
       .translate(50, 55)
       .scale(1. / 2.f);
   EXPECT_EQ(expectedMatrix,
             webViewImpl->getDeviceEmulationTransformForTesting());
   // visibleContentRect doesn't change.
   EXPECT_EQ(IntRect(50, 55, 50, 75),
             *devToolsEmulator->visibleContentRectForPainting());
 }
 
 }  // namespace blink