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

chrome/browser/extensions/api/preference/preference_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/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/translate/core/common/translate_pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/test_extension_registry_observer.h"
+#include "extensions/test/result_catcher.h"
 
 namespace {
 
 void ReleaseBrowserProcessModule() {
   g_browser_process->ReleaseModule();
 }
 
 }  // namespace
 
 class ExtensionPreferenceApiTest : public ExtensionApiTest {
@@ skipping 169 matching lines @@
   EXPECT_FALSE(pref->IsExtensionControlled());
   EXPECT_EQ(true, prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, OnChange) {
   EXPECT_TRUE(RunExtensionTestIncognito("preference/onchange")) <<
       message_;
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, OnChangeSplit) {
-  ResultCatcher catcher;
-  catcher.RestrictToProfile(profile_);
-  ResultCatcher catcher_incognito;
-  catcher_incognito.RestrictToProfile(profile_->GetOffTheRecordProfile());
+  extensions::ResultCatcher catcher;
+  catcher.RestrictToBrowserContext(profile_);
+  extensions::ResultCatcher catcher_incognito;
+  catcher_incognito.RestrictToBrowserContext(
+      profile_->GetOffTheRecordProfile());
 
   // Open an incognito window.
   ui_test_utils::OpenURLOffTheRecord(profile_, GURL("chrome://newtab/"));
 
   // changeDefault listeners.
   ExtensionTestMessageListener listener1("changeDefault regular ready", true);
   ExtensionTestMessageListener listener_incognito1(
       "changeDefault incognito ready", true);
 
   // changeIncognitoOnly listeners.
@@ skipping 94 matching lines @@
 
   // Test 6 - clearDefault
   EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready
   EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready
   listener10.Reply("ok");
   listener_incognito10.Reply("ok");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message();
 }