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

extensions/browser/api/serial/serial_apitest.cc

 // Copyright 2014 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 <string>
 
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "device/serial/test_serial_io_handler.h"
 #include "extensions/browser/api/serial/serial_api.h"
 #include "extensions/browser/api/serial/serial_connection.h"
 #include "extensions/browser/extension_function.h"
 #include "extensions/common/api/serial.h"
+#include "extensions/test/result_catcher.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::_;
 using testing::Return;
 
 namespace {
 
 class SerialApiTest : public ExtensionApiTest {
  public:
   SerialApiTest() {}
@@ skipping 84 matching lines @@
 // mean that your user is in the "tty" or "uucp" group on Ubuntu flavors of
 // Linux, or else that the port's path (e.g., /dev/ttyACM0) has global
 // read/write permissions.
 //
 // 3. You have uploaded a program to the board that does a byte-for-byte echo
 // on the virtual serial port at 57600 bps. An example is at
 // chrome/test/data/extensions/api_test/serial/api/serial_arduino_test.ino.
 //
 #define SIMULATE_SERIAL_PORTS (1)
 IN_PROC_BROWSER_TEST_F(SerialApiTest, SerialFakeHardware) {
-  ResultCatcher catcher;
-  catcher.RestrictToProfile(browser()->profile());
+  extensions::ResultCatcher catcher;
+  catcher.RestrictToBrowserContext(browser()->profile());
 
 #if SIMULATE_SERIAL_PORTS
   ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction(
       "serial.getDevices", FakeSerialGetDevicesFunctionFactory));
   ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction(
       "serial.connect", FakeSerialConnectFunctionFactory));
 #endif
 
   ASSERT_TRUE(RunExtensionTest("serial/api")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(SerialApiTest, SerialRealHardware) {
-  ResultCatcher catcher;
-  catcher.RestrictToProfile(browser()->profile());
+  extensions::ResultCatcher catcher;
+  catcher.RestrictToBrowserContext(browser()->profile());
 
   ASSERT_TRUE(RunExtensionTest("serial/real_hardware")) << message_;
 }