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

chrome/browser/extensions/api/gcm/gcm_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 "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/api/gcm/gcm_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_gcm_app_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "extensions/test/result_catcher.h"
+
+using extensions::ResultCatcher;
 
 namespace {
 
 const char kEventsExtension[] = "gcm/events";
 
 gcm::GCMClient::SendErrorDetails CreateErrorDetails(
     const std::string& message_id,
     const gcm::GCMClient::Result result,
     const std::string& total_messages) {
   gcm::GCMClient::SendErrorDetails error;
@@ skipping 140 matching lines @@
   EXPECT_EQ("destination-id", service()->last_receiver_id());
   const gcm::GCMClient::OutgoingMessage& message =
       service()->last_sent_message();
   gcm::GCMClient::MessageData::const_iterator iter;
 
   EXPECT_EQ(2419200, message.time_to_live);
 }
 
 IN_PROC_BROWSER_TEST_F(GcmApiTest, OnMessagesDeleted) {
   ResultCatcher catcher;
-  catcher.RestrictToProfile(profile());
+  catcher.RestrictToBrowserContext(profile());
 
   const extensions::Extension* extension =
       LoadTestExtension(kEventsExtension, "on_messages_deleted.html");
   ASSERT_TRUE(extension);
 
   extensions::ExtensionGCMAppHandler app_handler(profile());
   app_handler.OnMessagesDeleted(extension->id());
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(GcmApiTest, OnMessage) {
   ResultCatcher catcher;
-  catcher.RestrictToProfile(profile());
+  catcher.RestrictToBrowserContext(profile());
 
   const extensions::Extension* extension =
       LoadTestExtension(kEventsExtension, "on_message.html");
   ASSERT_TRUE(extension);
 
   extensions::ExtensionGCMAppHandler app_handler(profile());
 
   gcm::GCMClient::IncomingMessage message;
   message.data["property1"] = "value1";
   message.data["property2"] = "value2";
   // First message is sent without a collapse key.
   app_handler.OnMessage(extension->id(), message);
 
   // Second message carries the same data and a collapse key.
   message.collapse_key = "collapseKeyValue";
   app_handler.OnMessage(extension->id(), message);
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(GcmApiTest, OnSendError) {
   ResultCatcher catcher;
-  catcher.RestrictToProfile(profile());
+  catcher.RestrictToBrowserContext(profile());
 
   const extensions::Extension* extension =
       LoadTestExtension(kEventsExtension, "on_send_error.html");
   ASSERT_TRUE(extension);
 
   std::string total_expected_messages = "5";
   extensions::ExtensionGCMAppHandler app_handler(profile());
   app_handler.OnSendError(
       extension->id(),
       CreateErrorDetails("error_message_1",
@@ skipping 18 matching lines @@
       extension->id(),
       CreateErrorDetails("error_message_5",
                          gcm::GCMClient::TTL_EXCEEDED,
                          total_expected_messages));
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(GcmApiTest, Incognito) {
   ResultCatcher catcher;
-  catcher.RestrictToProfile(profile());
+  catcher.RestrictToBrowserContext(profile());
   ResultCatcher incognito_catcher;
-  incognito_catcher.RestrictToProfile(profile()->GetOffTheRecordProfile());
+  incognito_catcher.RestrictToBrowserContext(
+      profile()->GetOffTheRecordProfile());
 
   ASSERT_TRUE(RunExtensionTestIncognito("gcm/functions/incognito"));
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(incognito_catcher.GetNextResult()) << incognito_catcher.message();
 }
 
 }  // namespace extensions