chrome/browser/content_settings/content_settings_browsertest.cc - Issue 2380943004: Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

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/browser/content_settings/content_settings_browsertest.cc

Issue 2380943004: Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter (Closed)

Patch Set: More missing #includes Created 4 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 unified diff | Download patch

« no previous file with comments | « no previous file | chrome/browser/content_settings/local_shared_objects_container.h » ('j') | chrome/browser/content_settings/local_shared_objects_container.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/path_service.h"	6 #include "base/path_service.h"

7 #include "base/strings/stringprintf.h"	7 #include "base/strings/stringprintf.h"

8 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "base/test/scoped_feature_list.h"	9 #include "base/test/scoped_feature_list.h"

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

	11 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"

11 #include "chrome/browser/chrome_notification_types.h"	12 #include "chrome/browser/chrome_notification_types.h"

12 #include "chrome/browser/content_settings/cookie_settings_factory.h"	13 #include "chrome/browser/content_settings/cookie_settings_factory.h"

13 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"	14 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"

14 #include "chrome/browser/content_settings/tab_specific_content_settings.h"	15 #include "chrome/browser/content_settings/tab_specific_content_settings.h"

15 #include "chrome/browser/net/url_request_mock_util.h"	16 #include "chrome/browser/net/url_request_mock_util.h"

16 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"	17 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"

17 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

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

19 #include "chrome/browser/ui/browser_commands.h"	20 #include "chrome/browser/ui/browser_commands.h"

20 #include "chrome/browser/ui/tabs/tab_strip_model.h"	21 #include "chrome/browser/ui/tabs/tab_strip_model.h"

(...skipping 518 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
539 #endif // defined(ENABLE_PEPPER_CDMS) && defined(WIDEVINE_CDM_AVAILABLE)	540 #endif // defined(ENABLE_PEPPER_CDMS) && defined(WIDEVINE_CDM_AVAILABLE)

540	541

541 #if !defined(DISABLE_NACL)	542 #if !defined(DISABLE_NACL)

542 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest,	543 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest,

543 NaCl) {	544 NaCl) {

544 RunJavaScriptBlockedTest("load_nacl_no_js.html", true);	545 RunJavaScriptBlockedTest("load_nacl_no_js.html", true);

545 }	546 }

546 #endif // !defined(DISABLE_NACL)	547 #endif // !defined(DISABLE_NACL)

547	548

548 #endif // defined(ENABLE_PLUGINS)	549 #endif // defined(ENABLE_PLUGINS)

OLD	NEW