Track focused view in TestRunner instead of in BlinkTestRunner.

content/shell/renderer/layout_test/blink_test_runner.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 "content/shell/renderer/layout_test/blink_test_runner.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <clocale>
@@ skipping 190 matching lines @@
  protected:
   ~MockAudioCapturerSource() override {}
 };
 
 }  // namespace
 
 BlinkTestRunner::BlinkTestRunner(RenderView* render_view)
     : RenderViewObserver(render_view),
       RenderViewObserverTracker<BlinkTestRunner>(render_view),
       proxy_(NULL),
-      focused_view_(NULL),
       is_main_window_(false),
       focus_on_next_commit_(false),
       leak_detector_(new LeakDetector(this)) {
 }
 
 BlinkTestRunner::~BlinkTestRunner() {
 }
 
 // WebTestDelegate  -----------------------------------------------------------
 
@@ skipping 262 matching lines @@
   content::ClearGeofencingMockProvider();
 }
 
 void BlinkTestRunner::SetGeofencingMockPosition(double latitude,
                                                 double longitude) {
   content::SetGeofencingMockPosition(latitude, longitude);
 }
 
 void BlinkTestRunner::SetFocus(blink::WebView* web_view, bool focus) {
   RenderView* render_view = RenderView::FromWebView(web_view);
-  if (!render_view) {
-    NOTREACHED();
-    return;
-  }
-
-  // Check whether the focused view was closed meanwhile.
-  if (!BlinkTestRunner::Get(focused_view_))
-    focused_view_ = NULL;
-
-  if (focus) {
-    if (focused_view_ != render_view) {
-      if (focused_view_)
-        SetFocusAndActivate(focused_view_, false);
-      SetFocusAndActivate(render_view, true);
-      focused_view_ = render_view;
-    }
-  } else {
-    if (focused_view_ == render_view) {
-      SetFocusAndActivate(render_view, false);
-      focused_view_ = NULL;
-    }
-  }
+  if (render_view)  // Check whether |web_view| has been already closed.
+    SetFocusAndActivate(render_view, focus);
 }
 
 void BlinkTestRunner::SetAcceptAllCookies(bool accept) {
   Send(new LayoutTestHostMsg_AcceptAllCookies(routing_id(), accept));
 }
 
 std::string BlinkTestRunner::PathToLocalResource(const std::string& resource) {
 #if defined(OS_WIN)
   if (resource.find("/tmp/") == 0) {
     // We want a temp file.
@@ skipping 408 matching lines @@
                                       params.enable_pixel_dumping);
 }
 
 void BlinkTestRunner::OnSetTestConfiguration(
     const ShellTestConfiguration& params) {
   OnReplicateTestConfiguration(params);
 
   ForceResizeRenderView(
       render_view(),
       WebSize(params.initial_size.width(), params.initial_size.height()));
-  SetFocus(proxy_->web_view(), true);
+  LayoutTestRenderProcessObserver::GetInstance()
+      ->test_interfaces()
+      ->TestRunner()
+      ->SetFocus(render_view()->GetWebView(), true);
 }
 
 void BlinkTestRunner::OnSessionHistory(
     const std::vector<int>& routing_ids,
     const std::vector<std::vector<PageState>>& session_histories,
     const std::vector<unsigned>& current_entry_indexes) {
   routing_ids_ = routing_ids;
   session_histories_ = session_histories;
   current_entry_indexes_ = current_entry_indexes;
   CaptureDump();
@@ skipping 31 matching lines @@
   get_bluetooth_events_callbacks_.pop_front();
   callback.Run(events);
 }
 
 void BlinkTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content