| Index: content/browser/child_process_security_policy_browsertest.cc
|
| ===================================================================
|
| --- content/browser/child_process_security_policy_browsertest.cc (revision 120814)
|
| +++ content/browser/child_process_security_policy_browsertest.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -10,7 +10,7 @@
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/test/base/in_process_browser_test.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| -#include "content/browser/child_process_security_policy.h"
|
| +#include "content/browser/child_process_security_policy_impl.h"
|
| #include "content/browser/tab_contents/tab_contents.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/common/result_codes.h"
|
| @@ -23,13 +23,15 @@
|
| public:
|
| virtual void SetUp() {
|
| EXPECT_EQ(
|
| - ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 0U);
|
| + ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
|
| + 0U);
|
| InProcessBrowserTest::SetUp();
|
| }
|
|
|
| virtual void TearDown() {
|
| EXPECT_EQ(
|
| - ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 0U);
|
| + ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
|
| + 0U);
|
| InProcessBrowserTest::TearDown();
|
| }
|
| };
|
| @@ -41,7 +43,8 @@
|
|
|
| ui_test_utils::NavigateToURL(browser(), url);
|
| EXPECT_EQ(
|
| - ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 1U);
|
| + ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
|
| + 1U);
|
|
|
| WebContents* tab = browser()->GetWebContentsAt(0);
|
| ASSERT_TRUE(tab != NULL);
|
| @@ -50,5 +53,6 @@
|
|
|
| tab->GetController().Reload(true);
|
| EXPECT_EQ(
|
| - ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 1U);
|
| + ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
|
| + 1U);
|
| }
|
|
|