Move more Sockets browser tests into appshell tests.

chrome/browser/extensions/api/socket/socket_apitest.cc

 // 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.
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "extensions/browser/api/dns/host_resolver_wrapper.h"
 #include "extensions/browser/api/dns/mock_host_resolver_creator.h"
 #include "extensions/browser/api/socket/socket_api.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 
 using extensions::Extension;
 
-namespace utils = extension_function_test_utils;
-
 namespace {
 
 const std::string kHostname = "127.0.0.1";
 const int kPort = 8888;
 
 class SocketApiTest : public ExtensionApiTest {
  public:
   SocketApiTest() : resolver_event_(true, false),
                     resolver_creator_(
                         new extensions::MockHostResolverCreator()) {
@@ skipping 14 matching lines @@
   base::WaitableEvent resolver_event_;
 
   // The MockHostResolver asserts that it's used on the same thread on which
   // it's created, which is actually a stronger rule than its real counterpart.
   // But that's fine; it's good practice.
   scoped_refptr<extensions::MockHostResolverCreator> resolver_creator_;
 };
 
 }  // namespace
 
-IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketUDPCreateGood) {
-  scoped_refptr<extensions::SocketCreateFunction> socket_create_function(
-      new extensions::SocketCreateFunction());
-  scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
-
-  socket_create_function->set_extension(empty_extension.get());
-  socket_create_function->set_has_callback(true);
-
-  scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-      socket_create_function.get(), "[\"udp\"]", browser(), utils::NONE));
-  ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
-  base::DictionaryValue *value =
-      static_cast<base::DictionaryValue*>(result.get());
-  int socket_id = -1;
-  EXPECT_TRUE(value->GetInteger("socketId", &socket_id));
-  EXPECT_GT(socket_id, 0);
-}
-
-IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketTCPCreateGood) {
-  scoped_refptr<extensions::SocketCreateFunction> socket_create_function(
-      new extensions::SocketCreateFunction());
-  scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
-
-  socket_create_function->set_extension(empty_extension.get());
-  socket_create_function->set_has_callback(true);
-
-  scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-      socket_create_function.get(), "[\"tcp\"]", browser(), utils::NONE));
-  ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
-  base::DictionaryValue *value =
-      static_cast<base::DictionaryValue*>(result.get());
-  int socket_id = -1;
-  EXPECT_TRUE(value->GetInteger("socketId", &socket_id));
-  ASSERT_GT(socket_id, 0);
-}
-
-IN_PROC_BROWSER_TEST_F(SocketApiTest, GetNetworkList) {
-  scoped_refptr<extensions::SocketGetNetworkListFunction> socket_function(
-      new extensions::SocketGetNetworkListFunction());
-  scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
-
-  socket_function->set_extension(empty_extension.get());
-  socket_function->set_has_callback(true);
-
-  scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
-      socket_function.get(), "[]", browser(), utils::NONE));
-  ASSERT_EQ(base::Value::TYPE_LIST, result->GetType());
-
-  // If we're invoking socket tests, all we can confirm is that we have at
-  // least one address, but not what it is.
-  base::ListValue *value = static_cast<base::ListValue*>(result.get());
-  ASSERT_GT(value->GetSize(), 0U);
-}
-
 IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketUDPExtension) {
   scoped_ptr<net::SpawnedTestServer> test_server(
       new net::SpawnedTestServer(
           net::SpawnedTestServer::TYPE_UDP_ECHO,
           net::SpawnedTestServer::kLocalhost,
           base::FilePath(FILE_PATH_LITERAL("net/data"))));
   EXPECT_TRUE(test_server->Start());
 
   net::HostPortPair host_port_pair = test_server->host_port_pair();
   int port = host_port_pair.port();
@@ skipping 73 matching lines @@
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
   ExtensionTestMessageListener listener("info_please", true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("socket/api")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
   listener.Reply(
       base::StringPrintf("multicast:%s:%d", kHostname.c_str(), kPort));
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }