Add missing TaskScheduler on tests using RendereWidgetHostImpl

content/browser/renderer_host/text_input_client_mac_unittest.mm

 // 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.
 
 #import "content/browser/renderer_host/text_input_client_mac.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
+#include "base/test/scoped_task_scheduler.h"
 #include "base/threading/thread.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/text_input_client_message_filter.h"
 #include "content/common/text_input_client_messages.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 15 matching lines @@
   void Paste() override {}
   void SelectAll() override {}
 };
 
 // This test does not test the WebKit side of the dictionary system (which
 // performs the actual data fetching), but rather this just tests that the
 // service's signaling system works.
 class TextInputClientMacTest : public testing::Test {
  public:
   TextInputClientMacTest()
-      : browser_context_(),
+      : task_scheduler_(&message_loop_),
+        browser_context_(),
         process_factory_(),
         delegate_(),
         thread_("TextInputClientMacTestThread") {
     RenderProcessHost* rph =
         process_factory_.CreateRenderProcessHost(&browser_context_, nullptr);
     int32_t routing_id = rph->GetNextRoutingID();
     widget_.reset(new RenderWidgetHostImpl(&delegate_, rph, routing_id, false));
   }
 
+  void TearDown() override {
+    // |widget_| needs to be cleared before flushing the message loop, otherwise
+    // |widgets_|'s destructor calls MockRenderProcessHost::Cleanup, it
+    // schedules the MRPH deletion, and then MockRenderProcessHostFactory also
+    // deletes the MRPH before scheduled MRPH deletion is invoked.

[kinuko, 2017/03/31 14:26:55]

Whoa.

+    widget_.reset();
+    base::RunLoop().RunUntilIdle();
+  }
+
   // Accessor for the TextInputClientMac instance.
   TextInputClientMac* service() {
     return TextInputClientMac::GetInstance();
   }
 
   // Helper method to post a task on the testing thread's MessageLoop after
   // a short delay.
   void PostTask(const tracked_objects::Location& from_here,
                 const base::Closure& task) {
     PostTask(from_here, task, base::TimeDelta::FromMilliseconds(kTaskDelayMs));
   }
 
   void PostTask(const tracked_objects::Location& from_here,
                 const base::Closure& task,
                 const base::TimeDelta delay) {
     thread_.task_runner()->PostDelayedTask(from_here, task, delay);
   }
 
   RenderWidgetHostImpl* widget() { return widget_.get(); }
 
   IPC::TestSink& ipc_sink() {
     return static_cast<MockRenderProcessHost*>(widget()->GetProcess())->sink();
   }
 
  private:
   friend class ScopedTestingThread;
 
   base::MessageLoopForUI message_loop_;
+
+  // TaskScheduler is used by RenderWidgetHostImpl constructor.
+  base::test::ScopedTaskScheduler task_scheduler_;
+
   TestBrowserContext browser_context_;
 
   // Gets deleted when the last RWH in the "process" gets destroyed.
   MockRenderProcessHostFactory process_factory_;
   MockRenderWidgetHostDelegate delegate_;
   std::unique_ptr<RenderWidgetHostImpl> widget_;
 
   base::Thread thread_;
 };
 
@@ skipping 101 matching lines @@
 
 TEST_F(TextInputClientMacTest, TimeoutRectForRange) {
   NSRect rect = service()->GetFirstRectForRange(widget(), NSMakeRange(0, 32));
   EXPECT_EQ(1U, ipc_sink().message_count());
   EXPECT_TRUE(ipc_sink().GetUniqueMessageMatching(
       TextInputClientMsg_FirstRectForCharacterRange::ID));
   EXPECT_NSEQ(NSZeroRect, rect);
 }
 
 }  // namespace content