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

chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.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/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/autocomplete_input.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "components/omnibox/autocomplete_result.h"
+#include "extensions/test/result_catcher.h"
 #include "ui/base/window_open_disposition.h"
 
 using base::ASCIIToUTF16;
+using extensions::ResultCatcher;
 using metrics::OmniboxEventProto;
 
 // http://crbug.com/167158
 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_Basic) {
   ASSERT_TRUE(RunExtensionTest("omnibox")) << message_;
 
   // The results depend on the TemplateURLService being loaded. Make sure it is
   // loaded so that the autocomplete results are consistent.
   Profile* profile = browser()->profile();
   ui_test_utils::WaitForTemplateURLServiceToLoad(
@@ skipping 163 matching lines @@
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // Tests that we get suggestions from and send input to the incognito context
 // of an incognito split mode extension.
 // http://crbug.com/100927
 // Test is flaky: http://crbug.com/101219
 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_IncognitoSplitMode) {
   Profile* profile = browser()->profile();
   ResultCatcher catcher_incognito;
-  catcher_incognito.RestrictToProfile(profile->GetOffTheRecordProfile());
+  catcher_incognito.RestrictToBrowserContext(profile->GetOffTheRecordProfile());
 
   ASSERT_TRUE(RunExtensionTestIncognito("omnibox")) << message_;
 
   // Open an incognito window and wait for the incognito extension process to
   // respond.
   Browser* incognito_browser = CreateIncognitoBrowser();
   ASSERT_TRUE(catcher_incognito.GetNextResult()) << catcher_incognito.message();
 
   // The results depend on the TemplateURLService being loaded. Make sure it is
   // loaded so that the autocomplete results are consistent.
@@ skipping 29 matching lines @@
   {
     ResultCatcher catcher;
     autocomplete_controller->Start(AutocompleteInput(
         ASCIIToUTF16("keyword command incognito"), base::string16::npos,
         base::string16(), GURL(), OmniboxEventProto::NTP, true, false, true,
         true, ChromeAutocompleteSchemeClassifier(profile)));
     location_bar->AcceptInput();
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   }
 }