chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm - Issue 2858032: Display content settings applying to the current otr session only.

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/cocoa/content_exceptions_window_controller_unittest.mm

Issue 2858032: Display content settings applying to the current otr session only. (Closed)

Patch Set: updates Created 10 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/cocoa/content_exceptions_window_controller.mm ('k') | chrome/browser/cocoa/content_settings_dialog_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm

diff --git a/chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm b/chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm

index 995c21eab06d7096473f02335e227a7ebd527443..730a0453bc4402cf76919ed70f04ba914ba2664a 100644

--- a/chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm

+++ b/chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm

@@ -57,7 +57,8 @@ class ContentExceptionsWindowControllerTest : public CocoaTest {

ContentExceptionsWindowController* GetController(ContentSettingsType type) {

id controller = [ContentExceptionsWindowController

controllerForType:type

- settingsMap:settingsMap_.get()];

+ settingsMap:settingsMap_.get()

+ otrSettingsMap:NULL];

[controller showWindow:nil];

return controller;

}

@@ -96,7 +97,8 @@ TEST_F(ContentExceptionsWindowControllerTest, Construction) {

ContentExceptionsWindowController* controller =

[ContentExceptionsWindowController

controllerForType:CONTENT_SETTINGS_TYPE_PLUGINS

- settingsMap:settingsMap_.get()];

+ settingsMap:settingsMap_.get()

+ otrSettingsMap:NULL];

[controller showWindow:nil];

[controller close]; // Should autorelease.

}