Chromium Code Reviews| 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" |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 30 #include "content/public/browser/navigation_handle.h" | 30 #include "content/public/browser/navigation_handle.h" |
| 31 #include "content/public/browser/notification_observer.h" | 31 #include "content/public/browser/notification_observer.h" |
| 32 #include "content/public/browser/notification_service.h" | 32 #include "content/public/browser/notification_service.h" |
| 33 #include "content/public/browser/plugin_service.h" | 33 #include "content/public/browser/plugin_service.h" |
| 34 #include "content/public/browser/render_frame_host.h" | 34 #include "content/public/browser/render_frame_host.h" |
| 35 #include "content/public/browser/render_process_host.h" | 35 #include "content/public/browser/render_process_host.h" |
| 36 #include "content/public/browser/render_view_host.h" | 36 #include "content/public/browser/render_view_host.h" |
| 37 #include "content/public/browser/web_contents.h" | 37 #include "content/public/browser/web_contents.h" |
| 38 #include "content/public/common/content_constants.h" | 38 #include "content/public/common/content_constants.h" |
| 39 #include "content/public/common/content_switches.h" | 39 #include "content/public/common/content_switches.h" |
| 40 #include "content/public/common/mhtml_generation_params.h" | |
|
carlosk
2017/03/06 23:10:49
Removing this because it confused my codesearch fo
| |
| 41 #include "content/public/test/browser_test_utils.h" | 40 #include "content/public/test/browser_test_utils.h" |
| 42 #include "content/public/test/ppapi_test_utils.h" | 41 #include "content/public/test/ppapi_test_utils.h" |
| 43 #include "content/public/test/test_utils.h" | 42 #include "content/public/test/test_utils.h" |
| 44 #include "media/cdm/cdm_paths.h" | 43 #include "media/cdm/cdm_paths.h" |
| 45 #include "net/dns/mock_host_resolver.h" | 44 #include "net/dns/mock_host_resolver.h" |
| 46 #include "net/test/embedded_test_server/embedded_test_server.h" | 45 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 47 #include "net/test/url_request/url_request_mock_http_job.h" | 46 #include "net/test/url_request/url_request_mock_http_job.h" |
| 48 #include "ppapi/features/features.h" | 47 #include "ppapi/features/features.h" |
| 49 #include "ppapi/shared_impl/ppapi_switches.h" | 48 #include "ppapi/shared_impl/ppapi_switches.h" |
| 50 #include "testing/gmock/include/gmock/gmock.h" | 49 #include "testing/gmock/include/gmock/gmock.h" |
| (...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 541 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) && defined(WIDEVINE_CDM_AVAILABLE) | 540 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) && defined(WIDEVINE_CDM_AVAILABLE) |
| 542 | 541 |
| 543 #if !defined(DISABLE_NACL) | 542 #if !defined(DISABLE_NACL) |
| 544 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest, | 543 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest, |
| 545 NaCl) { | 544 NaCl) { |
| 546 RunJavaScriptBlockedTest("load_nacl_no_js.html", true); | 545 RunJavaScriptBlockedTest("load_nacl_no_js.html", true); |
| 547 } | 546 } |
| 548 #endif // !defined(DISABLE_NACL) | 547 #endif // !defined(DISABLE_NACL) |
| 549 | 548 |
| 550 #endif // BUILDFLAG(ENABLE_PLUGINS) | 549 #endif // BUILDFLAG(ENABLE_PLUGINS) |
| OLD | NEW |