chrome/browser/extensions/api/runtime/runtime_apitest.cc - Issue 16268017: GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1

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/runtime/runtime_apitest.cc

Issue 16268017: GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/proxy/proxy_apitest.cc ('k') | chrome/browser/extensions/api/streams_private/streams_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/runtime/runtime_apitest.cc

diff --git a/chrome/browser/extensions/api/runtime/runtime_apitest.cc b/chrome/browser/extensions/api/runtime/runtime_apitest.cc

index 55f0d2a10521901b4f099343373465df09b51554..c2c17bec8c8567351e11d76ca3f762be1870629c 100644

--- a/chrome/browser/extensions/api/runtime/runtime_apitest.cc

+++ b/chrome/browser/extensions/api/runtime/runtime_apitest.cc

@@ -6,6 +6,7 @@

#include "chrome/browser/extensions/extension_apitest.h"

#include "chrome/browser/extensions/extension_function_test_utils.h"

#include "chrome/test/base/ui_test_utils.h"

+#include "net/test/embedded_test_server/embedded_test_server.h"

// Tests the privileged components of chrome.runtime.

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimePrivileged) {

@@ -14,14 +15,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimePrivileged) {

// Tests the unprivileged components of chrome.runtime.

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeUnprivileged) {

- ASSERT_TRUE(StartTestServer());

+ ASSERT_TRUE(StartEmbeddedTestServer());

ASSERT_TRUE(

LoadExtension(test_data_dir_.AppendASCII("runtime/content_script")));

// The content script runs on webpage.html.

ResultCatcher catcher;

ui_test_utils::NavigateToURL(browser(),

- test_server()->GetURL("webpage.html"));

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

EXPECT_TRUE(catcher.GetNextResult()) << message_;

}