Revert 112693 - committed before review was done - Landing 8688002: PPB_TCPSocket_Private/PPB_UDP...

chrome/test/ui/ppapi_uitest.cc

 // 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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
 #include "content/browser/plugin_service.h"
 #include "content/public/common/content_switches.h"
@@ skipping 152 matching lines @@
     // MIME type = application/x-ppapi-<test_name>
     FilePath plugin_dir;
     EXPECT_TRUE(PathService::Get(base::DIR_EXE, &plugin_dir));
 
     FilePath plugin_lib = plugin_dir.Append(library_name);
     EXPECT_TRUE(file_util::PathExists(plugin_lib));
     FilePath::StringType pepper_plugin = plugin_lib.value();
     pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests"));
     launch_arguments_.AppendSwitchNative(switches::kRegisterPepperPlugins,
                                          pepper_plugin);
-    launch_arguments_.AppendSwitchASCII(switches::kAllowNaClSocketAPI,
-                                        "127.0.0.1");
   }
 
   std::string BuildQuery(const std::string& base,
                          const std::string& test_case){
     return StringPrintf("%stestcase=%s", base.c_str(), test_case.c_str());
   }
 
 };
 
 // Variant of PPAPITest that runs plugins out-of-process to test proxy
 // codepaths.
 class OutOfProcessPPAPITest : public PPAPITest {
  public:
   OutOfProcessPPAPITest() {
     // Run PPAPI out-of-process to exercise proxy implementations.
     launch_arguments_.AppendSwitch(switches::kPpapiOutOfProcess);
   }
 };
 
 // NaCl plugin test runner.
 class PPAPINaClTest : public PPAPITestBase {
  public:
   PPAPINaClTest() {
     FilePath plugin_lib;
     EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
     EXPECT_TRUE(file_util::PathExists(plugin_lib));
 
     // Enable running NaCl outside of the store.
     launch_arguments_.AppendSwitch(switches::kEnableNaCl);
-    launch_arguments_.AppendSwitchASCII(switches::kAllowNaClSocketAPI,
-                                        "127.0.0.1");
   }
 
   // Append the correct mode and testcase string
   std::string BuildQuery(const std::string& base,
                          const std::string& test_case) {
     return StringPrintf("%smode=nacl&testcase=%s", base.c_str(),
                         test_case.c_str());
   }
 };
 
@@ skipping 72 matching lines @@
 TEST_PPAPI_OUT_OF_PROCESS(Graphics2D)
 TEST_PPAPI_NACL_VIA_HTTP(Graphics2D)
 
 TEST_PPAPI_IN_PROCESS(ImageData)
 TEST_PPAPI_OUT_OF_PROCESS(ImageData)
 TEST_PPAPI_NACL_VIA_HTTP(ImageData)
 
 TEST_PPAPI_IN_PROCESS(Buffer)
 TEST_PPAPI_OUT_OF_PROCESS(Buffer)
 
-// TODO(ygorshenin): investigate why
-// TEST_PPAPI_IN_PROCESS(TCPSocketPrivateShared) fails,
-// http://crbug.com/105860.
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(TCPSocketPrivateShared)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(TCPSocketPrivateShared)
-TEST_PPAPI_NACL_VIA_HTTP(TCPSocketPrivateShared)
-
-// TODO(ygorshenin): investigate why
-// TEST_PPAPI_IN_PROCESS(UDPSocketPrivateShared) fails,
-// http://crbug.com/105860.
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivateShared)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivateShared)
-TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivateShared)
-
 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader)
 TEST_PPAPI_NACL_VIA_HTTP(URLLoader)
 
 TEST_PPAPI_IN_PROCESS(PaintAggregator)
 TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator)
 TEST_PPAPI_NACL_VIA_HTTP(PaintAggregator)
 
 TEST_PPAPI_IN_PROCESS(Scrollbar)
 // http://crbug.com/89961
@@ skipping 170 matching lines @@
 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_InvalidConfigs)
 
 TEST_PPAPI_IN_PROCESS(Audio_Creation)
 TEST_PPAPI_IN_PROCESS(Audio_DestroyNoStop)
 TEST_PPAPI_IN_PROCESS(Audio_Failures)
 TEST_PPAPI_OUT_OF_PROCESS(Audio_Creation)
 TEST_PPAPI_OUT_OF_PROCESS(Audio_DestroyNoStop)
 TEST_PPAPI_OUT_OF_PROCESS(Audio_Failures)
 
 #endif // ADDRESS_SANITIZER