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

chrome/browser/apps/app_browsertest.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 "apps/launcher.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/prefs/pref_service.h"
@@ skipping 26 matching lines @@
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/common/api/app_runtime.h"
+#include "extensions/test/result_catcher.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "url/gurl.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #endif
@@ skipping 1022 matching lines @@
   }
 }
 
 // Fails on Win7. http://crbug.com/171450
 #if defined(OS_WIN)
 #define MAYBE_Messaging DISABLED_Messaging
 #else
 #define MAYBE_Messaging Messaging
 #endif
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_Messaging) {
-  ExtensionApiTest::ResultCatcher result_catcher;
+  ResultCatcher result_catcher;
   LoadAndLaunchPlatformApp("messaging/app2", "Ready");
   LoadAndLaunchPlatformApp("messaging/app1", "Launched");
   EXPECT_TRUE(result_catcher.GetNextResult());
 }
 
 // TODO(linux_aura) http://crbug.com/163931
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
 #define MAYBE_WebContentsHasFocus DISABLED_WebContentsHasFocus
 #else
 // This test depends on focus and so needs to be in interactive_ui_tests.
@@ skipping 195 matching lines @@
   // data are not installed and then install them. The application will then be
   // uninstalled and the same process will be repeated.
   std::string extension_id;
 
   {
     const Extension* extension =
         LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");
     ASSERT_TRUE(extension);
     extension_id = extension->id();
 
-    ExtensionApiTest::ResultCatcher result_catcher;
+    ResultCatcher result_catcher;
     EXPECT_TRUE(result_catcher.GetNextResult());
   }
 
   UninstallExtension(extension_id);
   content::RunAllPendingInMessageLoop();
 
   {
     const Extension* extension =
         LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");
     ASSERT_TRUE(extension);
     ASSERT_EQ(extension_id, extension->id());
 
-    ExtensionApiTest::ResultCatcher result_catcher;
+    ResultCatcher result_catcher;
     EXPECT_TRUE(result_catcher.GetNextResult());
   }
 }
 
 }  // namespace extensions