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

chrome/browser/apps/ephemeral_app_browsertest.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 "chrome/browser/apps/ephemeral_app_browsertest.h"
 
 #include <vector>
 
 #include "apps/app_restore_service.h"
 #include "apps/saved_files_service.h"
@@ skipping 21 matching lines @@
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/switches.h"
+#include "extensions/test/result_catcher.h"
 #include "sync/api/fake_sync_change_processor.h"
 #include "sync/api/sync_change_processor_wrapper_for_test.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notifier_settings.h"
 
 using extensions::AppSyncData;
 using extensions::Event;
 using extensions::EventRouter;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionRegistry;
 using extensions::ExtensionRegistryObserver;
 using extensions::ExtensionSystem;
 using extensions::Manifest;
+using extensions::ResultCatcher;
 
 namespace {
 
 namespace alarms = extensions::api::alarms;
 
 const char kPowerTestApp[] = "ephemeral_apps/power";
 
 // Enabling sync causes these tests to be flaky on Windows. Disable sync so that
 // everything else can be tested. See crbug.com/401028
 #if defined(OS_WIN)
@@ skipping 535 matching lines @@
 
 // Verify that ephemeral apps will receive messages while they are running.
 // Flaky test: crbug.com/394426
 IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest,
                        DISABLED_ReceiveMessagesWhenLaunched) {
   const Extension* receiver =
       InstallAndLaunchEphemeralApp(kMessagingReceiverApp);
   ASSERT_TRUE(receiver);
 
   // Verify that messages are received while the app is running.
-  ExtensionApiTest::ResultCatcher result_catcher;
+  ResultCatcher result_catcher;
   LoadAndLaunchPlatformApp("ephemeral_apps/messaging_sender_success",
                            "Launched");
   EXPECT_TRUE(result_catcher.GetNextResult());
 
   CloseAppWaitForUnload(receiver->id());
 
   // Verify that messages are not received while the app is inactive.
   LoadAndLaunchPlatformApp("ephemeral_apps/messaging_sender_fail", "Launched");
   EXPECT_TRUE(result_catcher.GetNextResult());
 }
@@ skipping 410 matching lines @@
       base::Bind(&PowerSaveBlockerStub::Create, &power_settings));
 
   const Extension* app = InstallAndLaunchEphemeralApp(kPowerTestApp);
   ASSERT_TRUE(app);
   EXPECT_EQ(1, power_settings.keep_awake_count());
 
   CloseAppWaitForUnload(app->id());
 
   EXPECT_EQ(0, power_settings.keep_awake_count());
 }