Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(346)

Unified Diff: content/browser/child_process_security_policy_browsertest.cc

Issue 11274038: content/browser: Move more files into the content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win - part2 Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/cert_store_impl.cc ('k') | content/browser/child_process_security_policy_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « content/browser/cert_store_impl.cc ('k') | content/browser/child_process_security_policy_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698