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

chrome/browser/extensions/api/dial/dial_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/command_line.h"
 #include "chrome/browser/extensions/api/dial/dial_api.h"
 #include "chrome/browser/extensions/api/dial/dial_api_factory.h"
 #include "chrome/browser/extensions/api/dial/dial_registry.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "extensions/common/switches.h"
+#include "extensions/test/result_catcher.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "url/gurl.h"
 
 using extensions::DialDeviceData;
 using extensions::Extension;
 
 namespace api = extensions::api;
 
 namespace {
 
@@ skipping 22 matching lines @@
   // Setup the test.
   ASSERT_TRUE(RunExtensionSubtest("dial/experimental", "device_list.html"));
 
   // Send three device list updates.
   scoped_refptr<extensions::DialAPI> api =
       extensions::DialAPIFactory::GetInstance()->GetForBrowserContext(
           profile());
   ASSERT_TRUE(api.get());
   extensions::DialRegistry::DeviceList devices;
 
-  ResultCatcher catcher;
+  extensions::ResultCatcher catcher;
 
   DialDeviceData device1;
   device1.set_device_id("1");
   device1.set_label("1");
   device1.set_device_description_url(GURL("http://127.0.0.1/dd.xml"));
 
   devices.push_back(device1);
   api->SendEventOnUIThread(devices);
 
   DialDeviceData device2;
@@ skipping 21 matching lines @@
 
 // discoverNow does not do discovery when there are no listeners; in that case
 // the DIAL service will not be active.
 IN_PROC_BROWSER_TEST_F(DialAPITest, DiscoveryNoListeners) {
   ASSERT_TRUE(RunExtensionSubtest("dial/experimental",
                                   "discovery_no_listeners.html"));
 }
 
 // Make sure this API is only accessible to whitelisted extensions.
 IN_PROC_BROWSER_TEST_F(DialAPITest, NonWhitelistedExtension) {
-  ResultCatcher catcher;
-  catcher.RestrictToProfile(browser()->profile());
+  extensions::ResultCatcher catcher;
+  catcher.RestrictToBrowserContext(browser()->profile());
 
   ExtensionTestMessageListener listener("ready", true);
   const extensions::Extension* extension = LoadExtensionWithFlags(
       test_data_dir_.AppendASCII("dial/whitelist"),
       ExtensionBrowserTest::kFlagIgnoreManifestWarnings);
   // We should have a DIAL API not available warning.
   ASSERT_FALSE(extension->install_warnings().empty());
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(DialAPITest, OnError) {
   ASSERT_TRUE(RunExtensionSubtest("dial/experimental", "on_error.html"));
 }