chrome/browser/ui/views/extensions/bookmark_override_browsertest.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/ui/views/extensions/bookmark_override_browsertest.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/ui/views/collected_cookies_views_browsertest.cc ('k') | chrome/browser/ui/views/find_bar_views_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc

diff --git a/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc b/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc

index aa3f4ae26dd5457e5a9084dad95b625a75b25ea6..218447e9f142bc7d23a0bdd1a93065afff465ea5 100644

--- a/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc

+++ b/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc

@@ -32,7 +32,7 @@ const char kBookmarkKeybinding[] = "Ctrl+D";

// requests to override ctrl-D and the user has assigned it to an extension.

// Flaky on all platforms: https://crbug.com/448956.

IN_PROC_BROWSER_TEST_F(BookmarkOverrideTest, DISABLED_NonOverrideStarClick) {

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

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

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

const extensions::Extension* extension = GetSingleLoadedExtension();

@@ -70,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkOverrideTest, DISABLED_NonOverrideStarClick) {

// the user has assigned it to an extension.

// Flaky on all platforms: https://crbug.com/448956.

IN_PROC_BROWSER_TEST_F(BookmarkOverrideTest, DISABLED_NonOverrideBookmarkPage) {

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

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

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

const extensions::Extension* extension = GetSingleLoadedExtension();