Use FrameMatchingPredicate() to find RenderFrameHosts in ExtensionWebUITest.

chrome/browser/extensions/extension_webui_apitest.cc

 // Copyright 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 "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/common/api/test.h"
 #include "extensions/common/extension.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 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:
   testing::AssertionResult RunTest(const char* name,
                                    const GURL& page_url,
                                    const GURL& frame_url,
                                    bool expected_result) {
     // Tests are located in chrome/test/data/extensions/webui/$(name).
     base::FilePath path;
     PathService::Get(chrome::DIR_TEST_DATA, &path);
@@ skipping 62 matching lines @@
   content::RenderFrameHost* NavigateToWebUI(const GURL& page_url,
                                             const GURL& frame_url) {
     ui_test_utils::NavigateToURL(browser(), page_url);
 
     content::WebContents* active_web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
 
     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));
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionWebUITest, SanityCheckAvailableAPIsInFrame) {
   ASSERT_TRUE(RunTestOnExtensionsFrame("sanity_check_available_apis.js"));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionWebUITest,
                        SanityCheckAvailableAPIsInChromeFrame) {
   ASSERT_TRUE(RunTestOnChromeExtensionsFrame("sanity_check_available_apis.js"));
@@ skipping 113 matching lines @@
 
   ASSERT_TRUE(listener->WaitUntilSatisfied());
   listener->Reply(extension_id);
   listener.reset(new ExtensionTestMessageListener("createfailed", false));
   ASSERT_TRUE(listener->WaitUntilSatisfied());
 }
 
 }  // namespace
 
 }  // namespace extensions