chrome/browser/managed_mode/managed_mode_browsertest.cc - Issue 23581015: Reland r223124: Don't clear existing extension-defined preferences and content settings when reload…

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/managed_mode/managed_mode_browsertest.cc

Issue 23581015: Reland r223124: Don't clear existing extension-defined preferences and content settings when reload… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 7 years, 3 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/extension_prefs.cc ('k') | chrome/test/data/extensions/api_test/content_settings/standard/manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/managed_mode/managed_mode_browsertest.cc

diff --git a/chrome/browser/managed_mode/managed_mode_browsertest.cc b/chrome/browser/managed_mode/managed_mode_browsertest.cc

index 16877f2a05b9c48ec782bab4b1949b6de866022f..67e54ed72a6e307a51e508cf3266285ff7ece160 100644

--- a/chrome/browser/managed_mode/managed_mode_browsertest.cc

+++ b/chrome/browser/managed_mode/managed_mode_browsertest.cc

@@ -224,7 +224,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,

QueryHistory(history_service, "", options, &results);

// Check that the entries have the correct blocked_visit value.

- EXPECT_EQ(2u, results.size());

+ ASSERT_EQ(2u, results.size());

EXPECT_EQ(blocked_url.spec(), results[0].url().spec());

EXPECT_TRUE(results[0].blocked_visit());

EXPECT_EQ(allowed_url.spec(), results[1].url().spec());