| OLD | NEW |
| 1 // Copyright (c) 2011 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/process_util.h" | 9 #include "base/process_util.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/test/base/in_process_browser_test.h" | 11 #include "chrome/test/base/in_process_browser_test.h" |
| 12 #include "chrome/test/base/ui_test_utils.h" | 12 #include "chrome/test/base/ui_test_utils.h" |
| 13 #include "content/browser/child_process_security_policy.h" | 13 #include "content/browser/child_process_security_policy_impl.h" |
| 14 #include "content/browser/tab_contents/tab_contents.h" | 14 #include "content/browser/tab_contents/tab_contents.h" |
| 15 #include "content/public/browser/render_process_host.h" | 15 #include "content/public/browser/render_process_host.h" |
| 16 #include "content/public/common/result_codes.h" | 16 #include "content/public/common/result_codes.h" |
| 17 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
| 18 | 18 |
| 19 using content::WebContents; | 19 using content::WebContents; |
| 20 | 20 |
| 21 class ChildProcessSecurityPolicyInProcessBrowserTest | 21 class ChildProcessSecurityPolicyInProcessBrowserTest |
| 22 : public InProcessBrowserTest { | 22 : public InProcessBrowserTest { |
| 23 public: | 23 public: |
| 24 virtual void SetUp() { | 24 virtual void SetUp() { |
| 25 EXPECT_EQ( | 25 EXPECT_EQ( |
| 26 ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 0U); | 26 ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(), |
| 27 0U); |
| 27 InProcessBrowserTest::SetUp(); | 28 InProcessBrowserTest::SetUp(); |
| 28 } | 29 } |
| 29 | 30 |
| 30 virtual void TearDown() { | 31 virtual void TearDown() { |
| 31 EXPECT_EQ( | 32 EXPECT_EQ( |
| 32 ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 0U); | 33 ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(), |
| 34 0U); |
| 33 InProcessBrowserTest::TearDown(); | 35 InProcessBrowserTest::TearDown(); |
| 34 } | 36 } |
| 35 }; | 37 }; |
| 36 | 38 |
| 37 IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, NoLeak) { | 39 IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, NoLeak) { |
| 38 const FilePath kTestDir(FILE_PATH_LITERAL("google")); | 40 const FilePath kTestDir(FILE_PATH_LITERAL("google")); |
| 39 const FilePath kTestFile(FILE_PATH_LITERAL("google.html")); | 41 const FilePath kTestFile(FILE_PATH_LITERAL("google.html")); |
| 40 GURL url(ui_test_utils::GetTestUrl(kTestDir, kTestFile)); | 42 GURL url(ui_test_utils::GetTestUrl(kTestDir, kTestFile)); |
| 41 | 43 |
| 42 ui_test_utils::NavigateToURL(browser(), url); | 44 ui_test_utils::NavigateToURL(browser(), url); |
| 43 EXPECT_EQ( | 45 EXPECT_EQ( |
| 44 ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 1U); | 46 ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(), |
| 47 1U); |
| 45 | 48 |
| 46 WebContents* tab = browser()->GetWebContentsAt(0); | 49 WebContents* tab = browser()->GetWebContentsAt(0); |
| 47 ASSERT_TRUE(tab != NULL); | 50 ASSERT_TRUE(tab != NULL); |
| 48 base::KillProcess(tab->GetRenderProcessHost()->GetHandle(), | 51 base::KillProcess(tab->GetRenderProcessHost()->GetHandle(), |
| 49 content::RESULT_CODE_KILLED, true); | 52 content::RESULT_CODE_KILLED, true); |
| 50 | 53 |
| 51 tab->GetController().Reload(true); | 54 tab->GetController().Reload(true); |
| 52 EXPECT_EQ( | 55 EXPECT_EQ( |
| 53 ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 1U); | 56 ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(), |
| 57 1U); |
| 54 } | 58 } |
| OLD | NEW |