Revert 115289 - Added test for disallowed nacl sockets switch.

ChromiumOS ARM bots are unhappy with this change.


BUG=
TEST=


Review URL: http://codereview.chromium.org/8933027

TBR=ygorshenin@google.com
Review URL: http://codereview.chromium.org/9017017

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

5 files changed, 0 insertions, 131 deletions

diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi
index f68c7f9..5ebe710 100644
--- a/ppapi/ppapi_sources.gypi
+++ b/ppapi/ppapi_sources.gypi
@@ -290,12 +290,9 @@
       'tests/test_memory.cc',
       'tests/test_graphics_2d.cc',
       'tests/test_image_data.cc',
-      'tests/test_memory.cc',
       'tests/test_paint_aggregator.cc',
       'tests/test_post_message.cc',
       'tests/test_scrollbar.cc',
-      'tests/test_tcp_socket_private_disallowed.cc',
-      'tests/test_udp_socket_private_disallowed.cc',
       'tests/test_url_loader.cc',
       'tests/test_var.cc',
     ],
diff --git a/ppapi/tests/test_tcp_socket_private_disallowed.cc b/ppapi/tests/test_tcp_socket_private_disallowed.cc
deleted file mode 100644
index e86002c..0000000
--- a/ppapi/tests/test_tcp_socket_private_disallowed.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) 2011 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 "ppapi/tests/test_tcp_socket_private_disallowed.h"
-
-#include "ppapi/cpp/module.h"
-#include "ppapi/tests/testing_instance.h"
-
-REGISTER_TEST_CASE(TCPSocketPrivateDisallowed);
-
-TestTCPSocketPrivateDisallowed::TestTCPSocketPrivateDisallowed(
-    TestingInstance* instance)
-    : TestCase(instance), tcp_socket_private_interface_(NULL) {
-}
-
-bool TestTCPSocketPrivateDisallowed::Init() {
-  tcp_socket_private_interface_ = static_cast<const PPB_TCPSocket_Private*>(
-      pp::Module::Get()->GetBrowserInterface(PPB_TCPSOCKET_PRIVATE_INTERFACE));
-  if (!tcp_socket_private_interface_)
-    instance_->AppendError("TCPSocketPrivate interface not available");
-  return tcp_socket_private_interface_ && InitTestingInterface();
-}
-
-void TestTCPSocketPrivateDisallowed::RunTests(const std::string& filter) {
-  RUN_TEST(Create, filter);
-}
-
-std::string TestTCPSocketPrivateDisallowed::TestCreate() {
-  PP_Resource socket =
-      tcp_socket_private_interface_->Create(instance_->pp_instance());
-  if (0 != socket) {
-    return "PPB_TCPSocket_Private::Create returns valid socket " \
-        "without allowing switch";
-  }
-  PASS();
-}
diff --git a/ppapi/tests/test_tcp_socket_private_disallowed.h b/ppapi/tests/test_tcp_socket_private_disallowed.h
deleted file mode 100644
index 9371028..0000000
--- a/ppapi/tests/test_tcp_socket_private_disallowed.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef PPAPI_TESTS_TEST_TCP_SOCKET_PRIVATE_DISALLOWED_H_
-#define PPAPI_TESTS_TEST_TCP_SOCKET_PRIVATE_DISALLOWED_H_
-
-#include <string>
-
-#include "ppapi/cpp/private/tcp_socket_private.h"
-#include "ppapi/tests/test_case.h"
-
-class TestTCPSocketPrivateDisallowed : public TestCase {
- public:
-  explicit TestTCPSocketPrivateDisallowed(TestingInstance* instance);
-
-  // TestCase implementation.
-  virtual bool Init();
-  virtual void RunTests(const std::string& filter);
-
- private:
-  std::string TestCreate();
-
-  const PPB_TCPSocket_Private* tcp_socket_private_interface_;
-};
-
-#endif  // PPAPI_TESTS_TEST_TCP_SOCKET_PRIVATE_DISALLOWED_H_
diff --git a/ppapi/tests/test_udp_socket_private_disallowed.cc b/ppapi/tests/test_udp_socket_private_disallowed.cc
deleted file mode 100644
index b2bcbd9..0000000
--- a/ppapi/tests/test_udp_socket_private_disallowed.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) 2011 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 "ppapi/tests/test_udp_socket_private_disallowed.h"
-
-#include "ppapi/cpp/module.h"
-#include "ppapi/tests/testing_instance.h"
-
-REGISTER_TEST_CASE(UDPSocketPrivateDisallowed);
-
-TestUDPSocketPrivateDisallowed::TestUDPSocketPrivateDisallowed(
-    TestingInstance* instance)
-    : TestCase(instance), udp_socket_private_interface_(NULL) {
-}
-
-bool TestUDPSocketPrivateDisallowed::Init() {
-  udp_socket_private_interface_ = static_cast<const PPB_UDPSocket_Private*>(
-      pp::Module::Get()->GetBrowserInterface(PPB_UDPSOCKET_PRIVATE_INTERFACE));
-  if (!udp_socket_private_interface_)
-    instance_->AppendError("UDPSocketPrivate interface not available");
-  return udp_socket_private_interface_ && InitTestingInterface();
-}
-
-void TestUDPSocketPrivateDisallowed::RunTests(const std::string& filter) {
-  RUN_TEST(Create, filter);
-}
-
-std::string TestUDPSocketPrivateDisallowed::TestCreate() {
-  PP_Resource socket =
-      udp_socket_private_interface_->Create(instance_->pp_instance());
-  if (0 != socket) {
-    return "PPB_UDPSocket_Private::Create returns valid socket " \
-        "without allowing switch";
-  }
-  PASS();
-}
diff --git a/ppapi/tests/test_udp_socket_private_disallowed.h b/ppapi/tests/test_udp_socket_private_disallowed.h
deleted file mode 100644
index 807cc9b..0000000
--- a/ppapi/tests/test_udp_socket_private_disallowed.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef PPAPI_TESTS_TEST_UDP_SOCKET_PRIVATE_DISALLOWED_H_
-#define PPAPI_TESTS_TEST_UDP_SOCKET_PRIVATE_DISALLOWED_H_
-
-#include <string>
-
-#include "ppapi/cpp/private/udp_socket_private.h"
-#include "ppapi/tests/test_case.h"
-
-class TestUDPSocketPrivateDisallowed : public TestCase {
- public:
-  explicit TestUDPSocketPrivateDisallowed(TestingInstance* instance);
-
-  // TestCase implementation.
-  virtual bool Init();
-  virtual void RunTests(const std::string& filter);
-
- private:
-  std::string TestCreate();
-
-  const PPB_UDPSocket_Private* udp_socket_private_interface_;
-};
-
-#endif  // PPAPI_TESTS_TEST_UDP_SOCKET_PRIVATE_DISALLOWED_H_