chrome/browser/extensions/api/i18n/i18n_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/i18n/i18n_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/history/history_apitest.cc ('k') | chrome/browser/extensions/api/page_capture/page_capture_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/i18n/i18n_apitest.cc

diff --git a/chrome/browser/extensions/api/i18n/i18n_apitest.cc b/chrome/browser/extensions/api/i18n/i18n_apitest.cc

index a255d1f5993ca2a908406263fb93091e5b854dc5..12c71421d3f56e722eb45e3b3c4a37d2821868dc 100644

--- a/chrome/browser/extensions/api/i18n/i18n_apitest.cc

+++ b/chrome/browser/extensions/api/i18n/i18n_apitest.cc

@@ -10,15 +10,15 @@

#include "chrome/browser/ui/browser.h"

#include "chrome/common/extensions/extension.h"

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

-#include "net/test/spawned_test_server/spawned_test_server.h"

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

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18N) {

- ASSERT_TRUE(StartTestServer());

+ ASSERT_TRUE(StartEmbeddedTestServer());

ASSERT_TRUE(RunExtensionTest("i18n")) << message_;

}

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18NUpdate) {

- ASSERT_TRUE(StartTestServer());

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

// Create an Extension whose messages.json file will be updated.

base::ScopedTempDir extension_dir;

ASSERT_TRUE(extension_dir.CreateUniqueTempDir());

@@ -42,7 +42,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18NUpdate) {

// Test that the messages.json file is loaded and the i18n message is loaded.

ui_test_utils::NavigateToURL(

- browser(), test_server()->GetURL("file/extensions/test_file.html"));

+ browser(),

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

EXPECT_TRUE(catcher.GetNextResult());

string16 title;

@@ -58,7 +59,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18NUpdate) {

// Check that the i18n message is also changed.

ui_test_utils::NavigateToURL(

- browser(), test_server()->GetURL("file/extensions/test_file.html"));

+ browser(),

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

EXPECT_TRUE(catcher.GetNextResult());

ui_test_utils::GetCurrentTabTitle(browser(), &title);