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

chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc

 // Copyright (c) 2012 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/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/push_messaging/sync_setup_helper.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_frame_host.h"
 #include "extensions/common/extension_set.h"
+#include "extensions/test/result_catcher.h"
 #include "net/dns/mock_host_resolver.h"
 
 namespace {
 const char kTestExtensionId[] = "mfaehphpebmlbfdiegjnpidmibldjbjk";
 const char kPasswordFileForTest[] = "password-file-for-test";
 const char kOverrideUserDataDir[] = "override-user-data-dir";
 }  // namespace
 
 namespace extensions {
 
@@ skipping 108 matching lines @@
 
   const ExtensionSet* installed_extensions = extension_service()->extensions();
   if (!installed_extensions->Contains(kTestExtensionId)) {
     const Extension* extension =
         LoadExtension(test_data_dir_.AppendASCII("push_messaging_canary"));
     ASSERT_TRUE(extension);
   }
   ASSERT_TRUE(installed_extensions->Contains(kTestExtensionId));
 
   ResultCatcher catcher;
-  catcher.RestrictToProfile(profile());
+  catcher.RestrictToBrowserContext(profile());
 
   const Extension* extension =
       extension_service()->extensions()->GetByID(kTestExtensionId);
   ASSERT_TRUE(extension);
   ui_test_utils::NavigateToURL(
       browser(), extension->GetResourceURL("push_messaging_canary.html"));
 
   const std::string& client_id = sync_setup_helper()->client_id();
   const std::string& client_secret = sync_setup_helper()->client_secret();
   const std::string& refresh_token = sync_setup_helper()->refresh_token();
 
   const base::string16& script_string = base::UTF8ToUTF16(base::StringPrintf(
       "startTestWithCredentials('%s', '%s', '%s');",
       client_id.c_str(), client_secret.c_str(), refresh_token.c_str()));
 
   browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame()->
       ExecuteJavaScript(script_string);
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 }  // namespace extensions