| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/shell/browser/layout_test/layout_test_content_browser_client.h
" | 5 #include "content/shell/browser/layout_test/layout_test_content_browser_client.h
" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "content/public/browser/browser_context.h" | 8 #include "content/public/browser/browser_context.h" |
| 9 #include "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" |
| 10 #include "content/public/browser/render_process_host.h" | 10 #include "content/public/browser/render_process_host.h" |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 const MainFunctionParams& parameters) { | 126 const MainFunctionParams& parameters) { |
| 127 set_browser_main_parts(new LayoutTestBrowserMainParts(parameters)); | 127 set_browser_main_parts(new LayoutTestBrowserMainParts(parameters)); |
| 128 return shell_browser_main_parts(); | 128 return shell_browser_main_parts(); |
| 129 } | 129 } |
| 130 | 130 |
| 131 PlatformNotificationService* | 131 PlatformNotificationService* |
| 132 LayoutTestContentBrowserClient::GetPlatformNotificationService() { | 132 LayoutTestContentBrowserClient::GetPlatformNotificationService() { |
| 133 return layout_test_notification_manager_.get(); | 133 return layout_test_notification_manager_.get(); |
| 134 } | 134 } |
| 135 | 135 |
| 136 bool LayoutTestContentBrowserClient::ShouldAllowRunningInsecureContent( |
| 137 bool allowed_per_settings, |
| 138 const url::Origin& origin, |
| 139 const GURL& resource_url, |
| 140 content::WebContents* web_contents) { |
| 141 const base::DictionaryValue& test_flags = |
| 142 BlinkTestController::Get() |
| 143 ->accumulated_layout_test_runtime_flags_changes(); |
| 144 bool allow_running = false; |
| 145 test_flags.GetBoolean("running_insecure_content_allowed", &allow_running); |
| 146 |
| 147 return allowed_per_settings || allow_running; |
| 148 } |
| 149 |
| 136 } // namespace content | 150 } // namespace content |
| OLD | NEW |