[WIP Approach 2] Straighten up input method reactivation

content/renderer/render_view_browsertest.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <stdint.h>
 #include <tuple>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 1734 matching lines @@
 TEST_F(RenderViewImplTest, BasicRenderFrame) {
   EXPECT_TRUE(view()->main_render_frame_);
 }
 
 TEST_F(RenderViewImplTest, MessageOrderInDidChangeSelection) {
   LoadHTML("<textarea id=\"test\"></textarea>");
 
   view()->SetHandlingInputEventForTesting(true);
   ExecuteJavaScriptForTests("document.getElementById('test').focus();");
 
-  bool is_input_type_called = false;
-  bool is_selection_called = false;
-  size_t last_input_type = 0;
-  size_t last_selection = 0;
+  int first_input_type = -1;
+  int first_selection = -1;
 
   for (size_t i = 0; i < render_thread_->sink().message_count(); ++i) {
     const uint32_t type = render_thread_->sink().GetMessageAt(i)->type();
     if (type == ViewHostMsg_TextInputStateChanged::ID) {
-      is_input_type_called = true;
-      last_input_type = i;
+      if (first_input_type == -1)
+        first_input_type = static_cast<int>(i);
     } else if (type == FrameHostMsg_SelectionChanged::ID) {
-      is_selection_called = true;
-      last_selection = i;
+      if (first_selection == -1)
+        first_selection = static_cast<int>(i);
     }
   }
 
-  EXPECT_TRUE(is_input_type_called);
-  EXPECT_TRUE(is_selection_called);
-
-  // InputTypeChange shold be called earlier than SelectionChanged.
-  EXPECT_LT(last_input_type, last_selection);
+  EXPECT_NE(first_input_type, -1);
+  EXPECT_NE(first_selection, -1);
+  // InputTypeChange should be called earlier than SelectionChanged.
+  EXPECT_LT(first_input_type, first_selection);
 }
 
 class RendererErrorPageTest : public RenderViewImplTest {
  public:
   ContentRendererClient* CreateContentRendererClient() override {
     return new TestContentRendererClient;
   }
 
   RenderViewImpl* view() {
     return static_cast<RenderViewImpl*>(view_);
@@ skipping 752 matching lines @@
   ExpectPauseAndResume(3);
   blink::WebScriptSource source2(
       WebString::fromUTF8("function func2() { func1(); }; func2();"));
   frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1, 1);
 
   EXPECT_FALSE(IsPaused());
   Detach();
 }
 
 }  // namespace content