Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/browser/accessibility/accessibility_ipc_error_browsertest.cc

 // Copyright (c) 2014 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 "base/macros.h"
 #include "build/build_config.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 68 matching lines @@
   frame->set_no_create_browser_accessibility_manager_for_testing(false);
   ASSERT_TRUE(frame->GetOrCreateBrowserAccessibilityManager() != nullptr);
   frame->set_no_create_browser_accessibility_manager_for_testing(true);
 
   {
     // Hide one of the elements on the page, and wait for an accessibility
     // notification triggered by the hide.
     AccessibilityNotificationWaiter waiter(
         shell(), AccessibilityModeComplete, ui::AX_EVENT_LIVE_REGION_CHANGED);
     ASSERT_TRUE(ExecuteScript(
-        shell()->web_contents(),
-        "document.getElementById('p1').style.display = 'none';"));
+        shell(), "document.getElementById('p1').style.display = 'none';"));
     waiter.WaitForNotification();
   }
 
   // Show that accessibility was reset because the frame doesn't have a
   // BrowserAccessibilityManager anymore.
   ASSERT_EQ(nullptr, frame->browser_accessibility_manager());
 
   // Finally, allow creating a new accessibility manager and
   // ensure that we didn't kill the renderer; we can still send it messages.
   frame->set_no_create_browser_accessibility_manager_for_testing(false);
   const ui::AXTree* tree = nullptr;
   {
     AccessibilityNotificationWaiter waiter(
         shell(), AccessibilityModeComplete, ui::AX_EVENT_FOCUS);
-    ASSERT_TRUE(ExecuteScript(
-        shell()->web_contents(),
-        "document.getElementById('button').focus();"));
+    ASSERT_TRUE(
+        ExecuteScript(shell(), "document.getElementById('button').focus();"));
     waiter.WaitForNotification();
     tree = &waiter.GetAXTree();
   }
 
   // Get the accessibility tree, ensure it reflects the final state of the
   // document.
   const ui::AXNode* root = tree->root();
 
   // Use this for debugging if the test fails.
   VLOG(1) << tree->ToString();
@@ skipping 73 matching lines @@
   // Wait for the renderer to be killed.
   if (frame->IsRenderFrameLive()) {
     RenderProcessHostWatcher render_process_watcher(
         frame->GetProcess(), RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
     render_process_watcher.Wait();
   }
   ASSERT_FALSE(frame->IsRenderFrameLive());
 }
 
 }  // namespace content