| Index: content/browser/child_process_security_policy_browsertest.cc
|
| diff --git a/content/browser/child_process_security_policy_browsertest.cc b/content/browser/child_process_security_policy_browsertest.cc
|
| index 5d119e9d7c8664cd2fe4867954c49d3dea994a26..a6c8d59fc542fe8ce7a7a59137c2a9a7f3881e37 100644
|
| --- a/content/browser/child_process_security_policy_browsertest.cc
|
| +++ b/content/browser/child_process_security_policy_browsertest.cc
|
| @@ -16,17 +16,19 @@
|
| #include "content/test/content_browser_test_utils.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| +namespace content {
|
| +
|
| class ChildProcessSecurityPolicyInProcessBrowserTest
|
| - : public content::ContentBrowserTest {
|
| + : public ContentBrowserTest {
|
| public:
|
| - virtual void SetUp() {
|
| + virtual void SetUp() OVERRIDE {
|
| EXPECT_EQ(
|
| ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
|
| 0U);
|
| ContentBrowserTest::SetUp();
|
| }
|
|
|
| - virtual void TearDown() {
|
| + virtual void TearDown() OVERRIDE {
|
| EXPECT_EQ(
|
| ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
|
| 0U);
|
| @@ -39,19 +41,21 @@ IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, DISABLED_
|
| #else
|
| IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, NoLeak) {
|
| #endif
|
| - GURL url = content::GetTestUrl("", "simple_page.html");
|
| + GURL url = GetTestUrl("", "simple_page.html");
|
|
|
| - content::NavigateToURL(shell(), url);
|
| + NavigateToURL(shell(), url);
|
| EXPECT_EQ(
|
| ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
|
| 1U);
|
|
|
| - content::WebContents* web_contents = shell()->web_contents();
|
| + WebContents* web_contents = shell()->web_contents();
|
| base::KillProcess(web_contents->GetRenderProcessHost()->GetHandle(),
|
| - content::RESULT_CODE_KILLED, true);
|
| + RESULT_CODE_KILLED, true);
|
|
|
| web_contents->GetController().Reload(true);
|
| EXPECT_EQ(
|
| 1U,
|
| ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size());
|
| }
|
| +
|
| +} // namespace content
|
|
|