Move SocketsTcpApiTest.SocketsTcpCreateGood to app_shell_browsertests.

extensions/browser/api/dns/dns_apitest.cc

Index: extensions/browser/api/dns/dns_apitest.cc
diff --git a/extensions/browser/api/dns/dns_apitest.cc b/extensions/browser/api/dns/dns_apitest.cc
index fa2ec2fa7858ce598b1d7a3aca0cca7a4f03f6b0..26df4779e68c42c184358c2c55747e4d25e700d7 100644
--- a/extensions/browser/api/dns/dns_apitest.cc
+++ b/extensions/browser/api/dns/dns_apitest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
@@ -10,31 +9,15 @@
 #include "extensions/browser/api/dns/host_resolver_wrapper.h"
 #include "extensions/browser/api/dns/mock_host_resolver_creator.h"
 #include "extensions/browser/api_test_utils.h"
-#include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/common/extension.h"
-#include "extensions/common/extension_builder.h"
 #include "extensions/shell/test/shell_test.h"
 #include "net/base/net_errors.h"
 
 using extensions::api_test_utils::RunFunctionAndReturnSingleResult;
+using extensions::api_test_utils::RunDelegatelessFunctionAndReturnSingleResult;
 
 namespace extensions {
 
-namespace {
-
-class TestFunctionDispatcherDelegate
-    : public ExtensionFunctionDispatcher::Delegate {
- public:
-  TestFunctionDispatcherDelegate() {}
-  virtual ~TestFunctionDispatcherDelegate() {}
-
-  // NULL implementation.
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestFunctionDispatcherDelegate);
-};
-
-}  // namespace
-
 class DnsApiTest : public AppShellTest {
  public:
   DnsApiTest() : resolver_creator_(new MockHostResolverCreator()) {}
@@ -60,24 +43,14 @@ class DnsApiTest : public AppShellTest {
 
 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveIPLiteral) {
   scoped_refptr<DnsResolveFunction> resolve_function(new DnsResolveFunction());
-  scoped_refptr<Extension> empty_extension(
-      ExtensionBuilder()
-          .SetManifest(
-               DictionaryBuilder().Set("name", "Test").Set("version", "1.0"))
-          .Build());
+  scoped_refptr<Extension> empty_extension =
+      api_test_utils::CreateEmptyExtension();
 
   resolve_function->set_extension(empty_extension.get());
   resolve_function->set_has_callback(true);
 
-  TestFunctionDispatcherDelegate delegate;
-  scoped_ptr<ExtensionFunctionDispatcher> dispatcher(
-      new ExtensionFunctionDispatcher(browser_context(), &delegate));
-
-  scoped_ptr<base::Value> result(
-      RunFunctionAndReturnSingleResult(resolve_function.get(),
-                                       "[\"127.0.0.1\"]",
-                                       browser_context(),
-                                       dispatcher.Pass()));
+  scoped_ptr<base::Value> result(RunDelegatelessFunctionAndReturnSingleResult(
+      resolve_function.get(), "[\"127.0.0.1\"]", browser_context()));
   base::DictionaryValue* dict = NULL;
   ASSERT_TRUE(result->GetAsDictionary(&dict));
 
@@ -92,27 +65,17 @@ IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveIPLiteral) {
 
 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveHostname) {
   scoped_refptr<DnsResolveFunction> resolve_function(new DnsResolveFunction());
-  scoped_refptr<Extension> empty_extension(
-      ExtensionBuilder()
-          .SetManifest(
-               DictionaryBuilder().Set("name", "Test").Set("version", "1.0"))
-          .Build());
+  scoped_refptr<Extension> empty_extension =
+      api_test_utils::CreateEmptyExtension();
 
   resolve_function->set_extension(empty_extension.get());
   resolve_function->set_has_callback(true);
 
-  TestFunctionDispatcherDelegate delegate;
-  scoped_ptr<ExtensionFunctionDispatcher> dispatcher(
-      new ExtensionFunctionDispatcher(browser_context(), &delegate));
-
   std::string function_arguments("[\"");
   function_arguments += MockHostResolverCreator::kHostname;
   function_arguments += "\"]";
-  scoped_ptr<base::Value> result(
-      RunFunctionAndReturnSingleResult(resolve_function.get(),
-                                       function_arguments,
-                                       browser_context(),
-                                       dispatcher.Pass()));
+  scoped_ptr<base::Value> result(RunDelegatelessFunctionAndReturnSingleResult(
+      resolve_function.get(), function_arguments, browser_context()));
   base::DictionaryValue* dict = NULL;
   ASSERT_TRUE(result->GetAsDictionary(&dict));