Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher.

chrome/browser/extensions/api/tab_capture/tab_capture_apitest.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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/switches.h"
+#include "extensions/test/result_catcher.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 #if defined(OS_WIN) && defined(USE_ASH)
 #include "chrome/test/base/test_switches.h"
 #endif
 
 namespace extensions {
@@ skipping 92 matching lines @@
                                 content::PAGE_TRANSITION_LINK, false);
   content::WebContents* web_contents = browser()->OpenURL(params);
 
   content::RenderFrameHost* const main_frame = web_contents->GetMainFrame();
   ASSERT_TRUE(main_frame);
   listener.Reply(base::StringPrintf("web-contents-media-stream://%i:%i",
                                     main_frame->GetProcess()->GetID(),
                                     main_frame->GetRoutingID()));
 
   ResultCatcher catcher;
-  catcher.RestrictToProfile(browser()->profile());
+  catcher.RestrictToBrowserContext(browser()->profile());
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // http://crbug.com/177163
 #if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_ActiveTabPermission DISABLED_ActiveTabPermission
 #else
 #define MAYBE_ActiveTabPermission ActiveTabPermission
 #endif
 // Make sure tabCapture.capture only works if the tab has been granted
@@ skipping 29 matching lines @@
   EXPECT_TRUE(before_open_new_tab.WaitUntilSatisfied());
   browser()->OpenURL(params);
   before_open_new_tab.Reply("");
 
   // Add extension to whitelist and make sure capture succeeds.
   EXPECT_TRUE(before_whitelist_extension.WaitUntilSatisfied());
   AddExtensionToCommandLineWhitelist();
   before_whitelist_extension.Reply("");
 
   ResultCatcher catcher;
-  catcher.RestrictToProfile(browser()->profile());
+  catcher.RestrictToBrowserContext(browser()->profile());
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // http://crbug.com/177163
 #if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_FullscreenEvents DISABLED_FullscreenEvents
 #elif defined(USE_AURA) || defined(OS_MACOSX)
 // These don't always fire fullscreen events when run in tests. Tested manually.
 #define MAYBE_FullscreenEvents DISABLED_FullscreenEvents
 #elif defined(OS_LINUX)
@@ skipping 30 matching lines @@
                                                                  true);
   listeners_setup.Reply("");
 
   // Toggle again after JS should have the event.
   EXPECT_TRUE(fullscreen_entered.WaitUntilSatisfied());
   browser()->fullscreen_controller()->ToggleFullscreenModeForTab(web_contents,
                                                                  false);
   fullscreen_entered.Reply("");
 
   ResultCatcher catcher;
-  catcher.RestrictToProfile(browser()->profile());
+  catcher.RestrictToBrowserContext(browser()->profile());
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // Times out on Win dbg bots: http://crbug.com/177163
 // #if defined(OS_WIN) && !defined(NDEBUG)
 // Times out on all Win bots, flaky on MSan bots: http://crbug.com/294431
 #if defined(OS_WIN) || defined(MEMORY_SANITIZER)
 #define MAYBE_GrantForChromePages DISABLED_GrantForChromePages
 #else
 #define MAYBE_GrantForChromePages GrantForChromePages
@@ skipping 12 matching lines @@
                                 content::PAGE_TRANSITION_LINK, false);
   content::WebContents* web_contents = browser()->OpenURL(params);
   const Extension* extension = ExtensionRegistry::Get(
       web_contents->GetBrowserContext())->enabled_extensions().GetByID(
           kExtensionId);
   TabHelper::FromWebContents(web_contents)
       ->active_tab_permission_granter()->GrantIfRequested(extension);
   before_open_tab.Reply("");
 
   ResultCatcher catcher;
-  catcher.RestrictToProfile(browser()->profile());
+  catcher.RestrictToBrowserContext(browser()->profile());
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 #if (defined(OS_WIN) && !defined(NDEBUG)) || defined(OS_MACOSX)
 // http://crbug.com/326319
 #define MAYBE_CaptureInSplitIncognitoMode DISABLED_CaptureInSplitIncognitoMode
 #else
 #define MAYBE_CaptureInSplitIncognitoMode CaptureInSplitIncognitoMode
 #endif
 // Test that a tab can be captured in split incognito mode.
@@ skipping 12 matching lines @@
 #endif
 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_Constraints) {
   AddExtensionToCommandLineWhitelist();
   ASSERT_TRUE(RunExtensionSubtest("tab_capture", "constraints.html"))
       << message_;
 }
 
 }  // namespace
 
 }  // namespace extensions