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

extensions/browser/api/bluetooth_socket/bluetooth_socket_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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
 #include "device/bluetooth/test/mock_bluetooth_device.h"
 #include "device/bluetooth/test/mock_bluetooth_socket.h"
 #include "extensions/browser/api/bluetooth_socket/bluetooth_socket_api.h"
+#include "extensions/test/result_catcher.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using device::BluetoothAdapter;
 using device::BluetoothAdapterFactory;
 using device::BluetoothDevice;
 using device::BluetoothSocket;
 using device::BluetoothUUID;
 using device::MockBluetoothAdapter;
 using device::MockBluetoothDevice;
 using device::MockBluetoothSocket;
 using extensions::Extension;
+using extensions::ResultCatcher;
 
 namespace utils = extension_function_test_utils;
 namespace api = extensions::core_api;
 
 namespace {
 
 class BluetoothSocketApiTest : public ExtensionApiTest {
  public:
   BluetoothSocketApiTest() {}
 
@@ skipping 51 matching lines @@
 ACTION_TEMPLATE(InvokeCallbackArgument,
                 HAS_1_TEMPLATE_PARAMS(int, k),
                 AND_2_VALUE_PARAMS(p0, p1)) {
   ::std::tr1::get<k>(args).Run(p0, p1);
 }
 
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(BluetoothSocketApiTest, Connect) {
   ResultCatcher catcher;
-  catcher.RestrictToProfile(browser()->profile());
+  catcher.RestrictToBrowserContext(browser()->profile());
 
   // Return the right mock device object for the address used by the test,
   // return NULL for the "Device not found" test.
   EXPECT_CALL(*mock_adapter_.get(), GetDevice(mock_device1_->GetAddress()))
       .WillRepeatedly(testing::Return(mock_device1_.get()));
   EXPECT_CALL(*mock_adapter_.get(), GetDevice(std::string("aa:aa:aa:aa:aa:aa")))
       .WillOnce(testing::Return(static_cast<BluetoothDevice*>(NULL)));
 
   // Return a mock socket object as a successful result to the connect() call.
   BluetoothUUID service_uuid("8e3ad063-db38-4289-aa8f-b30e4223cf40");
@@ skipping 24 matching lines @@
 }
 
 #if defined(_LIBCPP_VERSION)
 // This test fails in libc++ builds, see http://crbug.com/392205.
 #define MAYBE_Listen DISABLED_Listen
 #else
 #define MAYBE_Listen Listen
 #endif
 IN_PROC_BROWSER_TEST_F(BluetoothSocketApiTest, MAYBE_Listen) {
   ResultCatcher catcher;
-  catcher.RestrictToProfile(browser()->profile());
+  catcher.RestrictToBrowserContext(browser()->profile());
 
   // Return a mock socket object as a successful result to the create service
   // call.
   BluetoothUUID service_uuid("2de497f9-ab28-49db-b6d2-066ea69f1737");
   scoped_refptr<testing::StrictMock<MockBluetoothSocket> > mock_server_socket
       = new testing::StrictMock<MockBluetoothSocket>();
   BluetoothAdapter::ServiceOptions service_options;
   service_options.name.reset(new std::string("MyServiceName"));
   EXPECT_CALL(
       *mock_adapter_.get(),
@@ skipping 41 matching lines @@
       .WillOnce(InvokeCallbackArgument<0>());
   EXPECT_CALL(*mock_client_socket.get(), Close());
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
   listener.Reply("go");
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothSocketApiTest, PermissionDenied) {
   ResultCatcher catcher;
-  catcher.RestrictToProfile(browser()->profile());
+  catcher.RestrictToBrowserContext(browser()->profile());
 
   // Run the test.
   scoped_refptr<const Extension> extension(
       LoadExtension(test_data_dir_.AppendASCII(
           "bluetooth_socket/permission_denied")));
   ASSERT_TRUE(extension.get());
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }