Revert 213466 "Create Sandbox{Linux|Win}Test and add Linux Sandb..."

> Create Sandbox{Linux|Win}Test and add Linux SandboxStatus test.
>     
> The resulting BrowserTest can be run on Chrome OS successfully.
>     
> BUG=None
> TEST=Passes
> 
> Review URL: https://chromiumcodereview.appspot.com/19869002

TBR=jorgelo@chromium.org

Review URL: https://codereview.chromium.org/19888009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213488 0039d316-1c4b-4281-b951-d872f2087c98

chrome/chrome_tests.gypi

@@ -1719,8 +1719,7 @@
         'test/gpu/gpu_feature_browsertest.cc',
         'test/gpu/webgl_infobar_browsertest.cc',
         'test/ppapi/ppapi_browsertest.cc',
-        'test/security_tests/sandbox_browsertest_linux.cc',
-        'test/security_tests/sandbox_browsertest_win.cc',
+        'test/security_tests/sandbox_browsertest.cc',
         # TODO(craig): Rename this and run from base_unittests when the test
         # is safe to run there. See http://crbug.com/78722 for details.
         '../base/files/file_path_watcher_browsertest.cc',

chrome/test/security_tests/sandbox_browsertest_win.cc → chrome/test/security_tests/sandbox_browsertest.cc

@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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.
 
@@ -8,9 +8,9 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 
-class SandboxWinTest : public InProcessBrowserTest {
+class SandboxTest : public InProcessBrowserTest {
  protected:
-  SandboxWinTest() : InProcessBrowserTest() {}
+  SandboxTest() : InProcessBrowserTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitchASCII(switches::kTestSandbox,
@@ -19,7 +19,9 @@ class SandboxWinTest : public InProcessBrowserTest {
 };
 
 // Need a cross-platform test library: http://crbug.com/45771
+#if defined(OS_WIN)
 // Verifies that chrome is running properly.
-IN_PROC_BROWSER_TEST_F(SandboxWinTest, ExecuteDll) {
+IN_PROC_BROWSER_TEST_F(SandboxTest, ExecuteDll) {
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
 }
+#endif