[InputEvent] Move 'beforeinput' logic into |CompositeEditCommand::willApplyEditing()| (3/3)

third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/editing/InputMethodController.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Range.h"
 #include "core/editing/Editor.h"
@@ skipping 972 matching lines @@
   underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
 
   document().setTitle(emptyString());
   controller().setComposition("hello", underlines, 5, 5);
   EXPECT_STREQ("beforeinput.data:hello;input.data:hello;",
                document().title().utf8().data());
 
   // Delete the existing composition.
   document().setTitle(emptyString());
   controller().setComposition("", underlines, 0, 0);
-  EXPECT_STREQ("beforeinput.data:;compositionend.data:;",
+  EXPECT_STREQ("beforeinput.data:null;input.data:null;compositionend.data:;",
                document().title().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, CompositionInputEventForInsert) {
   createHTMLWithCompositionInputEventListeners();
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
   underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
 
@@ skipping 33 matching lines @@
 
   document().setTitle(emptyString());
   controller().setComposition("n", underlines, 1, 1);
   EXPECT_STREQ("beforeinput.data:n;input.data:n;",
                document().title().utf8().data());
 
   // Insert empty text with previous composition.
   document().setTitle(emptyString());
   document().updateStyleAndLayout();
   controller().commitText("", 1);
-  EXPECT_STREQ("beforeinput.data:;compositionend.data:;",
+  EXPECT_STREQ("beforeinput.data:null;input.data:null;compositionend.data:;",
                document().title().utf8().data());
 }
 
 TEST_F(InputMethodControllerTest, CompositionEndEventForConfirm) {
   createHTMLWithCompositionEndEventListener(CaretSelection);
 
   // Simulate composition in the |contentEditable|.
   Vector<CompositionUnderline> underlines;
   underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
 
@@ skipping 82 matching lines @@
   EXPECT_EQ(WebTextInputTypeNone, controller().textInputType());
 
   document().getElementById("b")->focus();
   EXPECT_EQ(WebTextInputTypeTelephone, controller().textInputType());
 
   controller().finishComposingText(InputMethodController::KeepSelection);
   EXPECT_EQ(WebTextInputTypeTelephone, controller().textInputType());
 }
 
 }  // namespace blink