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

chrome/browser/chromeos/login/signin/oauth2_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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/login/auth/key.h"
 #include "chromeos/login/auth/user_context.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/process_manager.h"
+#include "extensions/test/result_catcher.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
@@ skipping 691 matching lines @@
 
   // Wait until we get send merge session request.
   WaitForMergeSessionToStart();
 
   // Reset ExtensionBrowserTest::observer_ to the right browser object.
   Browser* browser = FindOrCreateVisibleBrowser(profile());
   observer_.reset(new ExtensionTestNotificationObserver(browser));
 
   // Run background page tests. The tests will just wait for XHR request
   // to complete.
-  ResultCatcher catcher;
+  extensions::ResultCatcher catcher;
 
   scoped_ptr<ExtensionTestMessageListener> non_google_xhr_listener(
       new ExtensionTestMessageListener("non-google-xhr-received", false));
 
   // Load extension with a background page. The background page will
   // attempt to load |fake_google_page_url_| via XHR.
   const extensions::Extension* ext = LoadExtension(
       test_data_dir_.AppendASCII("merge_session"));
   ASSERT_TRUE(ext);
 
@@ skipping 22 matching lines @@
 
   if (!catcher.GetNextResult()) {
     std::string message = catcher.message();
     ADD_FAILURE() << "Tests failed: " << message;
   }
 
   EXPECT_TRUE(fake_google_.IsPageRequested());
 }
 
 }  // namespace chromeos