Move more Sockets browser tests into appshell tests.

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

Index: chrome/browser/extensions/api/socket/socket_apitest.cc
diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc
index bae99833dc820fbdcba4504a8343c258255c6382..945c450ad86d969892ded22cb8ce016b6abd08e9 100644
--- a/chrome/browser/extensions/api/socket/socket_apitest.cc
+++ b/chrome/browser/extensions/api/socket/socket_apitest.cc
@@ -5,7 +5,6 @@
 #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"
@@ -20,8 +19,6 @@
 
 using extensions::Extension;
 
-namespace utils = extension_function_test_utils;
-
 namespace {
 
 const std::string kHostname = "127.0.0.1";
@@ -56,60 +53,6 @@ class SocketApiTest : public ExtensionApiTest {
 
 }  // 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(