chrome/browser/extensions/api/extension_action/page_action_apitest.cc - Issue 1378123003: Adding SSL ETS Tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/extension_action/page_action_apitest.cc

Issue 1378123003: Adding SSL ETS Tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ets

Patch Set: Rebase. Created 5 years, 2 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

« no previous file with comments | « chrome/browser/extensions/api/extension_action/browser_action_apitest.cc ('k') | chrome/browser/extensions/api/i18n/i18n_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/page_action_apitest.cc

diff --git a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc

index 0a03fdb6441e3c02643450662825be512a37fb04..186487709e41999e2bceef49b4d1e6d0e9b6f941 100644

--- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc

+++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc

@@ -37,7 +37,7 @@ class PageActionApiTest : public ExtensionApiTest {

};

IN_PROC_BROWSER_TEST_F(PageActionApiTest, Basic) {

- ASSERT_TRUE(test_server()->Start());

+ ASSERT_TRUE(embedded_test_server()->Start());

ASSERT_TRUE(RunExtensionTest("page_action/basics")) << message_;

const Extension* extension = GetSingleLoadedExtension();

ASSERT_TRUE(extension) << message_;

@@ -201,7 +201,7 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, Getters) {

// Verify triggering page action.

IN_PROC_BROWSER_TEST_F(PageActionApiTest, TestTriggerPageAction) {

- ASSERT_TRUE(test_server()->Start());

+ ASSERT_TRUE(embedded_test_server()->Start());

ASSERT_TRUE(RunExtensionTest("trigger_actions/page_action")) << message_;

const Extension* extension = GetSingleLoadedExtension();

@@ -209,7 +209,7 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, TestTriggerPageAction) {

// Page action icon is displayed when a tab is created.

ui_test_utils::NavigateToURL(browser(),

- test_server()->GetURL("files/simple.html"));

+ embedded_test_server()->GetURL("/simple.html"));

chrome::NewTab(browser());

browser()->tab_strip_model()->ActivateTabAt(0, true);