chrome/test/ppapi/ppapi_interactive_browsertest.cc - Issue 670953006: Componentize HostContentSettingsMap and content settings providers.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/test/ppapi/ppapi_interactive_browsertest.cc

Issue 670953006: Componentize HostContentSettingsMap and content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: win64 suppress warnings Created 6 years, 1 month 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 unified diff | Download patch

« no previous file with comments | « chrome/test/ppapi/ppapi_browsertest.cc ('k') | chrome/test/ppapi/ppapi_test.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/test/ppapi/ppapi_test.h"	5 #include "chrome/test/ppapi/ppapi_test.h"

6	6

7 #include "build/build_config.h"	7 #include "build/build_config.h"

8 #include "chrome/browser/content_settings/host_content_settings_map.h"

9 #include "chrome/browser/profiles/profile.h"	8 #include "chrome/browser/profiles/profile.h"

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

	10 #include "components/content_settings/core/browser/host_content_settings_map.h"

11	11

12 //	12 //

13 // Interface tests.	13 // Interface tests.

14 //	14 //

15	15

16 // Disable tests under ASAN. http://crbug.com/104832.	16 // Disable tests under ASAN. http://crbug.com/104832.

17 // This is a bit heavy handed, but the majority of these tests fail under ASAN.	17 // This is a bit heavy handed, but the majority of these tests fail under ASAN.

18 // See bug for history.	18 // See bug for history.

19 #if !defined(ADDRESS_SANITIZER) && !defined(SYZYASAN)	19 #if !defined(ADDRESS_SANITIZER) && !defined(SYZYASAN)

20	20

(...skipping 15 matching lines...) Expand all Loading...
36 HostContentSettingsMap* settings_map =	36 HostContentSettingsMap* settings_map =

37 browser()->profile()->GetHostContentSettingsMap();	37 browser()->profile()->GetHostContentSettingsMap();

38	38

39 settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_MOUSELOCK,	39 settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_MOUSELOCK,

40 CONTENT_SETTING_BLOCK);	40 CONTENT_SETTING_BLOCK);

41	41

42 RunTestViaHTTP("MouseLock_FailWhenBlocked");	42 RunTestViaHTTP("MouseLock_FailWhenBlocked");

43 }	43 }

44	44

45 #endif // ADDRESS_SANITIZER	45 #endif // ADDRESS_SANITIZER

OLD	NEW