summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_override_apitest.cc
diff options
context:
space:
mode:
authoryoz <yoz@chromium.org>2014-09-09 16:16:32 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-09 23:27:26 +0000
commite8dc2f1ff837e32b9d02d65ab520d16187450bf9 (patch)
treeb5c8ef60f013a1a38e8e3f3bf78a8bed3351b100 /chrome/browser/extensions/extension_override_apitest.cc
parentea76f5f5c3d6e0f73876d040265ad121346e9f3d (diff)
downloadchromium_src-e8dc2f1ff837e32b9d02d65ab520d16187450bf9.zip
chromium_src-e8dc2f1ff837e32b9d02d65ab520d16187450bf9.tar.gz
chromium_src-e8dc2f1ff837e32b9d02d65ab520d16187450bf9.tar.bz2
Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher.
BUG=388893 Review URL: https://codereview.chromium.org/555633003 Cr-Commit-Position: refs/heads/master@{#294031}
Diffstat (limited to 'chrome/browser/extensions/extension_override_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_override_apitest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc
index db21578..b190d2e 100644
--- a/chrome/browser/extensions/extension_override_apitest.cc
+++ b/chrome/browser/extensions/extension_override_apitest.cc
@@ -16,6 +16,7 @@
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/web_contents.h"
#include "extensions/common/constants.h"
+#include "extensions/test/result_catcher.h"
using content::WebContents;
@@ -50,7 +51,7 @@ class ExtensionOverrideTest : public ExtensionApiTest {
IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtab) {
ASSERT_TRUE(RunExtensionTest("override/newtab")) << message_;
{
- ResultCatcher catcher;
+ extensions::ResultCatcher catcher;
// Navigate to the new tab page. The overridden new tab page
// will call chrome.test.notifyPass() .
ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab/"));
@@ -95,7 +96,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideNewtabIncognito) {
IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideHistory) {
ASSERT_TRUE(RunExtensionTest("override/history")) << message_;
{
- ResultCatcher catcher;
+ extensions::ResultCatcher catcher;
// Navigate to the history page. The overridden history page
// will call chrome.test.notifyPass() .
ui_test_utils::NavigateToURL(browser(), GURL("chrome://history/"));