Move DnsApiTest.DnsResolveIPLiteral and DnsApiTest.DnsResolveHostname to app_shell_browsertests.

This results in a significant speedup; tests run in <500ms instead of >2s because the lengthy browser_tests startup is avoided.

This clones some aspects of extension_function_test_utils into extensions/browser/api_test_utils.cc. Later CLs will clean up the redundancy.

BUG=388893

Review URL: https://codereview.chromium.org/394103004

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

3 files changed, 133 insertions, 0 deletions

diff --git a/apps/shell/app_shell.gyp b/apps/shell/app_shell.gyp
index 121df007..de0a74d 100644
--- a/apps/shell/app_shell.gyp
+++ b/apps/shell/app_shell.gyp
@@ -202,6 +202,7 @@
         '<(DEPTH)/content/content.gyp:content_app_both',
         '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_support',
         '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
+        '<(DEPTH)/extensions/extensions.gyp:extensions_test_support',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'defines': [
@@ -209,6 +210,7 @@
       ],
       'sources': [
         # TODO(yoz): Refactor once we have a second test target.
+        'browser/dns_apitest.cc',
         'browser/shell_browsertest.cc',
         'test/shell_test.h',
         'test/shell_test.cc',
diff --git a/apps/shell/browser/DEPS b/apps/shell/browser/DEPS
index 0b6fca2..dc74d1d 100644
--- a/apps/shell/browser/DEPS
+++ b/apps/shell/browser/DEPS
@@ -16,6 +16,9 @@ include_rules = [
   "+content/shell/browser/shell_devtools_delegate.h",
   "+content/shell/browser/shell_net_log.h",
 
+  # Only used in API tests that should be moved to extensions/browser/api/...
+  "+net",
+
   "+sync/api",
 
   # Disallow views to keep the binary size down.
diff --git a/apps/shell/browser/dns_apitest.cc b/apps/shell/browser/dns_apitest.cc
new file mode 100644
index 0000000..96736ea
--- /dev/null
+++ b/apps/shell/browser/dns_apitest.cc
@@ -0,0 +1,128 @@
+// Copyright 2014 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 "apps/shell/test/shell_test.h"
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/values.h"
+#include "extensions/browser/api/dns/dns_api.h"
+#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 "net/base/net_errors.h"
+
+using extensions::ExtensionFunctionDispatcher;
+using extensions::api_test_utils::RunFunctionAndReturnSingleResult;
+
+namespace {
+
+class TestFunctionDispatcherDelegate
+    : public ExtensionFunctionDispatcher::Delegate {
+ public:
+  TestFunctionDispatcherDelegate() {}
+  virtual ~TestFunctionDispatcherDelegate() {}
+
+  // NULL implementation.
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestFunctionDispatcherDelegate);
+};
+
+}  // namespace
+
+class DnsApiTest : public apps::AppShellTest {
+ public:
+  DnsApiTest() : resolver_creator_(new extensions::MockHostResolverCreator()) {}
+
+ private:
+  virtual void SetUpOnMainThread() OVERRIDE {
+    apps::AppShellTest::SetUpOnMainThread();
+    extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting(
+        resolver_creator_->CreateMockHostResolver());
+  }
+
+  virtual void TearDownOnMainThread() OVERRIDE {
+    extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting(
+        NULL);
+    resolver_creator_->DeleteMockHostResolver();
+    apps::AppShellTest::TearDownOnMainThread();
+  }
+
+  // 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_;
+};
+
+IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveIPLiteral) {
+  scoped_refptr<extensions::DnsResolveFunction> resolve_function(
+      new extensions::DnsResolveFunction());
+  scoped_refptr<extensions::Extension> empty_extension(
+      extensions::ExtensionBuilder()
+          .SetManifest(extensions::DictionaryBuilder().Set("name", "Test").Set(
+              "version", "1.0"))
+          .Build());
+
+  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()));
+  base::DictionaryValue* dict = NULL;
+  ASSERT_TRUE(result->GetAsDictionary(&dict));
+
+  int result_code = 0;
+  EXPECT_TRUE(dict->GetInteger("resultCode", &result_code));
+  EXPECT_EQ(net::OK, result_code);
+
+  std::string address;
+  EXPECT_TRUE(dict->GetString("address", &address));
+  EXPECT_EQ("127.0.0.1", address);
+}
+
+IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveHostname) {
+  scoped_refptr<extensions::DnsResolveFunction> resolve_function(
+      new extensions::DnsResolveFunction());
+  scoped_refptr<extensions::Extension> empty_extension(
+      extensions::ExtensionBuilder()
+          .SetManifest(extensions::DictionaryBuilder().Set("name", "Test").Set(
+              "version", "1.0"))
+          .Build());
+
+  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 += extensions::MockHostResolverCreator::kHostname;
+  function_arguments += "\"]";
+  scoped_ptr<base::Value> result(
+      RunFunctionAndReturnSingleResult(resolve_function.get(),
+                                       function_arguments,
+                                       browser_context(),
+                                       dispatcher.Pass()));
+  base::DictionaryValue* dict = NULL;
+  ASSERT_TRUE(result->GetAsDictionary(&dict));
+
+  int result_code = 0;
+  EXPECT_TRUE(dict->GetInteger("resultCode", &result_code));
+  EXPECT_EQ(net::OK, result_code);
+
+  std::string address;
+  EXPECT_TRUE(dict->GetString("address", &address));
+  EXPECT_EQ(extensions::MockHostResolverCreator::kAddress, address);
+}