| Index: content/browser/shared/child_process_security_policy_browsertest.cc
|
| diff --git a/content/browser/child_process_security_policy_browsertest.cc b/content/browser/shared/child_process_security_policy_browsertest.cc
|
| similarity index 74%
|
| rename from content/browser/child_process_security_policy_browsertest.cc
|
| rename to content/browser/shared/child_process_security_policy_browsertest.cc
|
| index 30d85db73b37d42551412c3bb8e59ce04117597e..0aeb74fe441803b59b0f54f1adb6b1e531be7a94 100644
|
| --- a/content/browser/child_process_security_policy_browsertest.cc
|
| +++ b/content/browser/shared/child_process_security_policy_browsertest.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "base/files/file_path.h"
|
| #include "build/build_config.h"
|
| -#include "content/browser/child_process_security_policy_impl.h"
|
| +#include "content/browser/shared/child_process_security_policy_helper.h"
|
| #include "content/browser/web_contents/web_contents_impl.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/common/result_codes.h"
|
| @@ -22,21 +22,22 @@ class ChildProcessSecurityPolicyInProcessBrowserTest
|
| public:
|
| void SetUp() override {
|
| EXPECT_EQ(
|
| - ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
|
| - 0U);
|
| + ChildProcessSecurityPolicyHelper::GetInstance()->security_state_.size(),
|
| + 0U);
|
| ContentBrowserTest::SetUp();
|
| }
|
|
|
| void TearDown() override {
|
| EXPECT_EQ(
|
| - ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
|
| - 0U);
|
| + ChildProcessSecurityPolicyHelper::GetInstance()->security_state_.size(),
|
| + 0U);
|
| ContentBrowserTest::TearDown();
|
| }
|
| };
|
|
|
| #if !defined(NDEBUG) && defined(OS_MACOSX)
|
| -IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, DISABLED_NoLeak) {
|
| +IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest,
|
| + DISABLED_NoLeak) {
|
| #else
|
| IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, NoLeak) {
|
| #endif
|
| @@ -44,8 +45,8 @@ IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, NoLeak) {
|
|
|
| NavigateToURL(shell(), url);
|
| EXPECT_EQ(
|
| - ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
|
| - 1U);
|
| + ChildProcessSecurityPolicyHelper::GetInstance()->security_state_.size(),
|
| + 1U);
|
|
|
| WebContents* web_contents = shell()->web_contents();
|
| web_contents->GetRenderProcessHost()->Shutdown(RESULT_CODE_KILLED, true);
|
| @@ -53,7 +54,7 @@ IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, NoLeak) {
|
| web_contents->GetController().Reload(true);
|
| EXPECT_EQ(
|
| 1U,
|
| - ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size());
|
| + ChildProcessSecurityPolicyHelper::GetInstance()->security_state_.size());
|
| }
|
|
|
| } // namespace content
|
|
|