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

chrome/browser/extensions/api/mdns/mdns_apitest.cc

 // Copyright 2013 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/command_line.h"
 #include "chrome/browser/extensions/api/mdns/mdns_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/extensions/api/mdns.h"
 #include "extensions/common/switches.h"
+#include "extensions/test/result_catcher.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using extensions::DnsSdRegistry;
 using ::testing::A;
 using ::testing::_;
 
 namespace api = extensions::api;
 
 namespace {
 
@@ skipping 57 matching lines @@
       .Times(1);
   EXPECT_CALL(*dns_sd_registry_, UnregisterDnsSdListener(service_type))
       .Times(1);
   EXPECT_CALL(*dns_sd_registry_,
               RemoveObserver(A<extensions::DnsSdRegistry::DnsSdObserver*>()))
       .Times(1);
 
   EXPECT_TRUE(RunExtensionSubtest("mdns/api", "register_listener.html"))
       << message_;
 
-  ResultCatcher catcher;
+  extensions::ResultCatcher catcher;
   // Dispatch 3 events, one of which should not be sent to the test extension.
   DnsSdRegistry::DnsSdServiceList services;
 
   extensions::DnsSdService service;
   service.service_name = service_type;
   services.push_back(service);
 
   dns_sd_registry_->DispatchMDnsEvent(service_type, services);
   dns_sd_registry_->DispatchMDnsEvent("_uninteresting._tcp.local", services);
   dns_sd_registry_->DispatchMDnsEvent(service_type, services);
@@ skipping 22 matching lines @@
   EXPECT_CALL(*dns_sd_registry_, UnregisterDnsSdListener(test_service_type))
       .Times(1);
   EXPECT_CALL(*dns_sd_registry_,
               RemoveObserver(A<extensions::DnsSdRegistry::DnsSdObserver*>()))
       .Times(1);
 
   EXPECT_TRUE(RunExtensionSubtest("mdns/api",
                                   "register_multiple_listeners.html"))
       << message_;
 
-  ResultCatcher catcher;
+  extensions::ResultCatcher catcher;
   DnsSdRegistry::DnsSdServiceList services;
 
   extensions::DnsSdService service;
   service.service_name = service_type;
   services.push_back(service);
 
   dns_sd_registry_->DispatchMDnsEvent(service_type, services);
   dns_sd_registry_->DispatchMDnsEvent(test_service_type, services);
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }