[Code cleanup] Remove num_of_active_touches_for_test function

We have num_of_active_touches_for_test in both TouchActionFilter and
InputRouterImpl class which are used in InputRouterImplTest only. This
CL makes InputRouterImplTest a friend class to TouchActionFilter so that
we can just access its private member.

This CL is a code cleanup, there is no behavior change introduced.

Bug: None
Change-Id: I768a5e293f5c16d1f1d39af7e2abf161f35e669d
Reviewed-on: https://chromium-review.googlesource.com/1246274Reviewed-by: Sahel Sharify <sahel@chromium.org>
Reviewed-by: Navid Zolghadr <nzolghadr@chromium.org>
Commit-Queue: Xida Chen <xidachen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595167}

content/browser/renderer_host/input/input_router_impl.h

@@ -110,9 +110,6 @@ class CONTENT_EXPORT InputRouterImpl : public InputRouter,
   bool OnMessageReceived(const IPC::Message& message) override;
 
   void OnHasTouchEventHandlersForTest(bool has_handlers);
-  int num_of_active_touches_for_test() {
-    return touch_action_filter_.num_of_active_touches_for_test();
-  }
 
  private:
   friend class InputRouterImplTest;

content/browser/renderer_host/input/input_router_impl_unittest.cc

@@ -433,11 +433,11 @@ class InputRouterImplTest : public testing::Test {
     input_router_->TouchEventHandled(
         TouchEventWithLatencyInfo(touch_event_), InputEventAckSource::BROWSER,
         ui::LatencyInfo(), state, overscroll, touch_action);
-    EXPECT_EQ(input_router_->num_of_active_touches_for_test(), 1);
+    EXPECT_EQ(input_router_->touch_action_filter_.num_of_active_touches_, 1);
     ReleaseTouchPoint(0);
     input_router_->OnTouchEventAck(TouchEventWithLatencyInfo(touch_event_),
                                    InputEventAckSource::BROWSER, state);
-    EXPECT_EQ(input_router_->num_of_active_touches_for_test(), 0);
+    EXPECT_EQ(input_router_->touch_action_filter_.num_of_active_touches_, 0);
   }
 
   void OnTouchEventAckWithAckState(InputEventAckState ack_state) {

content/browser/renderer_host/input/touch_action_filter.h

@@ -68,12 +68,12 @@ class CONTENT_EXPORT TouchActionFilter {
 
   void IncreaseActiveTouches();
   void DecreaseActiveTouches();
-  int num_of_active_touches_for_test() { return num_of_active_touches_; }
 
   // Debugging only.
   void AppendToGestureSequenceForDebugging(const char* str);
 
  private:
+  friend class InputRouterImplTest;
   friend class MockRenderWidgetHost;
   friend class TouchActionFilterTest;
   friend class SitePerProcessBrowserTouchActionTest;