3 files changed, 63 insertions, 49 deletions
diff --git a/chrome/browser/child_process_security_policy_browser_test.cc b/chrome/browser/child_process_security_policy_browser_test.cc
new file mode 100644
index 0000000..2e3e1c1
--- /dev/null
+++ b/chrome/browser/child_process_security_policy_browser_test.cc
@@ -0,0 +1,55 @@
+// Copyright (c) 2009 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.
+
+#include <string>
+
+#include "base/basictypes.h"
+#include "base/file_path.h"
+#include "chrome/browser/browser.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/child_process_security_policy.h"
+#include "chrome/browser/renderer_host/render_process_host.h"
+#include "chrome/common/chrome_paths.h"
+#include "chrome/test/in_process_browser_test.h"
+#include "chrome/test/ui_test_utils.h"
+#include "net/base/net_util.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+class ChildProcessSecurityPolicyInProcessBrowserTest
+    : public InProcessBrowserTest {
+ public:
+  virtual void SetUp() {
+    EXPECT_EQ(
+      ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 0U);
+    InProcessBrowserTest::SetUp();
+  }
+
+  virtual void TearDown() {
+    EXPECT_EQ(
+      ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 0U);
+    InProcessBrowserTest::TearDown();
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, NoLeak) {
+  FilePath path;
+  PathService::Get(chrome::DIR_TEST_DATA, &path);
+  path = path.Append(FilePath::FromWStringHack(L"google"));
+  path = path.Append(FilePath::FromWStringHack(L"google.html"));
+  GURL url = net::FilePathToFileURL(path);
+
+  ui_test_utils::NavigateToURL(browser(), url);
+  EXPECT_EQ(
+      ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 1U);
+
+  TabContents* tab = browser()->GetTabContentsAt(0);
+  ASSERT_TRUE(tab != NULL);
+  base::KillProcess(
+      tab->process()->process().handle(), base::PROCESS_END_KILLED_BY_USER,
+      true);
+
+  tab->controller().Reload(true);
+  EXPECT_EQ(
+      ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 1U);
+}
diff --git a/chrome/browser/child_process_security_policy_unittest.cc b/chrome/browser/child_process_security_policy_unittest.cc
index 08eb8dd..88f1e33 100644
--- a/chrome/browser/child_process_security_policy_unittest.cc
+++ b/chrome/browser/child_process_security_policy_unittest.cc
@@ -6,15 +6,8 @@
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/child_process_security_policy.h"
-#include "chrome/browser/renderer_host/render_process_host.h"
-#include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/test/in_process_browser_test.h"
-#include "chrome/test/ui_test_utils.h"
-#include "net/base/net_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -273,45 +266,3 @@ TEST_F(ChildProcessSecurityPolicyTest, RemoveRace) {
   EXPECT_FALSE(p->CanUploadFile(kRendererID, file));
   EXPECT_FALSE(p->HasDOMUIBindings(kRendererID));
 }
-
-#if defined(OS_WIN)
-/*
-class ChildProcessSecurityPolicyInProcessBrowserTest
-    : public InProcessBrowserTest {
- public:
-  virtual void SetUp() {
-    EXPECT_EQ(
-      ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 0U);
-    InProcessBrowserTest::SetUp();
-  }
-
-  virtual void TearDown() {
-    EXPECT_EQ(
-      ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 0U);
-    InProcessBrowserTest::TearDown();
-  }
-};
-
-IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, DISABLED_NoLeak) {
-  FilePath path;
-  PathService::Get(chrome::DIR_TEST_DATA, &path);
-  path = path.Append(FilePath::FromWStringHack(L"google"));
-  path = path.Append(FilePath::FromWStringHack(L"google.html"));
-  GURL url = net::FilePathToFileURL(path);
-
-  ui_test_utils::NavigateToURL(browser(), url);
-  EXPECT_EQ(
-      ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 1U);
-
-  TabContents* tab = browser()->GetTabContentsAt(0);
-  ASSERT_TRUE(tab != NULL);
-  base::KillProcess(
-      tab->process()->process().handle(), base::PROCESS_END_KILLED_BY_USER,
-      true);
-
-  tab->controller().Reload(true);
-  EXPECT_EQ(
-      ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 1U);
-}
-*/
-#endif
diff --git a/chrome/test/browser/browser_tests_dll.vcproj b/chrome/test/browser/browser_tests_dll.vcproj
index b531402..4013695 100644
--- a/chrome/test/browser/browser_tests_dll.vcproj
+++ b/chrome/test/browser/browser_tests_dll.vcproj
@@ -298,6 +298,14 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="TestChildProcessSecurityPolicy"
+			>
+			<File
+				RelativePath="..\..\browser\child_process_security_policy_browser_test.cc"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>