Use FrameMatchingPredicate() to find RenderFrameHosts in ExtensionWebUITest.

chrome/browser/extensions/extension_webui_apitest.cc

Index: chrome/browser/extensions/extension_webui_apitest.cc
diff --git a/chrome/browser/extensions/extension_webui_apitest.cc b/chrome/browser/extensions/extension_webui_apitest.cc
index 366a24a7eac146f6e2a03ff163ad078943506ea3..66333ccb4b5cef9bd58e7d2e5cca7c6d2438e476 100644
--- a/chrome/browser/extensions/extension_webui_apitest.cc
+++ b/chrome/browser/extensions/extension_webui_apitest.cc
@@ -26,17 +26,6 @@ namespace OnMessage = core_api::test::OnMessage;
 
 namespace {
 
-void FindFrame(const GURL& url,
-               content::RenderFrameHost** out,
-               content::RenderFrameHost* frame) {
-  if (frame->GetLastCommittedURL() == url) {
-    if (*out != NULL) {
-      ADD_FAILURE() << "Found multiple frames at " << url;
-    }
-    *out = frame;
-  }
-}
-
 // Tests running extension APIs on WebUI.
 class ExtensionWebUITest : public ExtensionApiTest {
  protected:
@@ -119,10 +108,9 @@ class ExtensionWebUITest : public ExtensionApiTest {
     if (active_web_contents->GetLastCommittedURL() == frame_url)
       return active_web_contents->GetMainFrame();
 
-    content::RenderFrameHost* frame_host = NULL;
-    active_web_contents->ForEachFrame(
-        base::Bind(&FindFrame, frame_url, &frame_host));
-    return frame_host;
+    return FrameMatchingPredicate(
+        active_web_contents,
+        base::Bind(&content::FrameHasSourceUrl, frame_url));
   }
 };