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

chrome/browser/extensions/api/system_storage/system_storage_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 <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/system_storage/storage_api_test_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "components/storage_monitor/test_storage_monitor.h"
 #include "extensions/browser/api/system_storage/storage_info_provider.h"
+#include "extensions/test/result_catcher.h"
 
 namespace {
 
 using extensions::StorageUnitInfoList;
 using extensions::test::TestStorageUnitInfo;
 using extensions::test::kRemovableStorageData;
 using storage_monitor::StorageMonitor;
 using storage_monitor::TestStorageMonitor;
 
 const struct TestStorageUnitInfo kTestingData[] = {
@@ skipping 89 matching lines @@
                 kTestingData[i].device_id),
             false));
     device_ids_listeners.push_back(listener);
   }
   ASSERT_TRUE(RunPlatformAppTest("system/storage")) << message_;
   for (size_t i = 0; i < device_ids_listeners.size(); ++i)
     EXPECT_TRUE(device_ids_listeners[i]->WaitUntilSatisfied());
 }
 
 IN_PROC_BROWSER_TEST_F(SystemStorageApiTest, StorageAttachment) {
-  ResultCatcher catcher;
+  extensions::ResultCatcher catcher;
   ExtensionTestMessageListener attach_listener("attach", false);
   ExtensionTestMessageListener detach_listener("detach", false);
 
   EXPECT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("system/storage_attachment")));
   // Simulate triggering onAttached event.
   ASSERT_TRUE(attach_listener.WaitUntilSatisfied());
 
   AttachRemovableStorage(kRemovableStorageData);
 
   std::string removable_storage_transient_id =
       StorageMonitor::GetInstance()->GetTransientIdForDeviceId(
           kRemovableStorageData.device_id);
   ExtensionTestMessageListener detach_device_id_listener(
       removable_storage_transient_id, false);
 
   // Simulate triggering onDetached event.
   ASSERT_TRUE(detach_listener.WaitUntilSatisfied());
   DetachRemovableStorage(kRemovableStorageData.device_id);
 
   ASSERT_TRUE(detach_device_id_listener.WaitUntilSatisfied());
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }