Track focused view in TestRunner instead of in BlinkTestRunner.

content/shell/renderer/layout_test/blink_test_runner.cc

Index: content/shell/renderer/layout_test/blink_test_runner.cc
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index 1ce0bf9e744dc7f5f2255679b140ffd3e5d3fb39..c48fe32a8a6f9a77ab6a250efa51475a506d9a26 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -208,7 +208,6 @@ 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)) {
@@ -491,28 +490,8 @@ void BlinkTestRunner::SetGeofencingMockPosition(double latitude,
 
 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) {
@@ -941,7 +920,10 @@ void BlinkTestRunner::OnSetTestConfiguration(
   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(