Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 555633003: Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 73b94ad7a1c514b1a31e10ac18e73f1ef98a2618..0b0752bb48cab8bb90019a7d805e23120e70d7c7 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -83,6 +83,7 @@
#include "content/public/test/test_utils.h"
#include "content/test/net/url_request_mock_http_job.h"
#include "extensions/common/switches.h"
+#include "extensions/test/result_catcher.h"
#include "net/base/escape.h"
#include "net/cert/x509_certificate.h"
#include "net/dns/mock_host_resolver.h"
@@ -3538,7 +3539,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, WebNavigation) {
// Wait for the extension to set itself up and return control to us.
ASSERT_TRUE(RunExtensionTest("webnavigation/prerender")) << message_;
- ResultCatcher catcher;
+ extensions::ResultCatcher catcher;
PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
@@ -3559,7 +3560,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, TabsApi) {
// Wait for the extension to set itself up and return control to us.
ASSERT_TRUE(RunExtensionTest("tabs/on_replaced")) << message_;
- ResultCatcher catcher;
+ extensions::ResultCatcher catcher;
PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
@@ -3593,7 +3594,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, StreamsTest) {
// navigation had prerender not intercepted it.
// streams_private/handle_mime_type reports success if it has handled the
// application/msword type.
- ResultCatcher catcher;
+ extensions::ResultCatcher catcher;
NavigateToDestURL();
EXPECT_TRUE(catcher.GetNextResult());
}

Powered by Google App Engine
This is Rietveld 408576698