chrome/browser/content_settings/content_settings_browsertest.cc - Issue 15957008: Move NaCl related switches to their own file.

Side by Side Diff: chrome/browser/content_settings/content_settings_browsertest.cc

Issue 15957008: Move NaCl related switches to their own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed unneeded include Created 7 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/component_updater/pnacl/pnacl_component_installer.cc ('k') | chrome/browser/nacl_host/nacl_process_host.cc » ('j') | chrome/nacl/nacl_switches.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/stringprintf.h"	7 #include "base/stringprintf.h"

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

9 #include "chrome/browser/content_settings/cookie_settings.h"	9 #include "chrome/browser/content_settings/cookie_settings.h"

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

11 #include "chrome/browser/content_settings/tab_specific_content_settings.h"	11 #include "chrome/browser/content_settings/tab_specific_content_settings.h"

12 #include "chrome/browser/net/url_request_mock_util.h"	12 #include "chrome/browser/net/url_request_mock_util.h"

13 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"	13 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"

14 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

15 #include "chrome/browser/ui/browser.h"	15 #include "chrome/browser/ui/browser.h"

16 #include "chrome/browser/ui/browser_commands.h"	16 #include "chrome/browser/ui/browser_commands.h"

17 #include "chrome/browser/ui/tabs/tab_strip_model.h"	17 #include "chrome/browser/ui/tabs/tab_strip_model.h"

18 #include "chrome/common/chrome_notification_types.h"	18 #include "chrome/common/chrome_notification_types.h"

19 #include "chrome/common/chrome_switches.h"	19 #include "chrome/common/chrome_switches.h"

20 #include "chrome/common/render_messages.h"	20 #include "chrome/common/render_messages.h"

	21 #include "chrome/nacl/nacl_switches.h"

21 #include "chrome/test/base/in_process_browser_test.h"	22 #include "chrome/test/base/in_process_browser_test.h"

22 #include "chrome/test/base/ui_test_utils.h"	23 #include "chrome/test/base/ui_test_utils.h"

23 #include "content/public/browser/browser_thread.h"	24 #include "content/public/browser/browser_thread.h"

24 #include "content/public/browser/plugin_service.h"	25 #include "content/public/browser/plugin_service.h"

25 #include "content/public/browser/render_process_host.h"	26 #include "content/public/browser/render_process_host.h"

26 #include "content/public/browser/render_view_host.h"	27 #include "content/public/browser/render_view_host.h"

27 #include "content/public/browser/web_contents.h"	28 #include "content/public/browser/web_contents.h"

28 #include "content/public/common/content_switches.h"	29 #include "content/public/common/content_switches.h"

29 #include "content/public/test/browser_test_utils.h"	30 #include "content/public/test/browser_test_utils.h"

30 #include "content/public/test/test_utils.h"	31 #include "content/public/test/test_utils.h"

(...skipping 567 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
598 RunJavaScriptBlockedTest("load_widevine_no_js.html", true);	599 RunJavaScriptBlockedTest("load_widevine_no_js.html", true);

599 #endif	600 #endif

600 #endif // defined(ENABLE_PEPPER_CDMS)	601 #endif // defined(ENABLE_PEPPER_CDMS)

601	602

602 #if !defined(DISABLE_NACL)	603 #if !defined(DISABLE_NACL)

603 RunJavaScriptBlockedTest("load_nacl_no_js.html", true);	604 RunJavaScriptBlockedTest("load_nacl_no_js.html", true);

604 #endif	605 #endif

605 }	606 }

606	607

607 #endif // defined(ENABLE_PLUGINS)	608 #endif // defined(ENABLE_PLUGINS)

OLD	NEW