Move DnsApiTest.DnsResolveIPLiteral and DnsApiTest.DnsResolveHostname to app_shell_browsertests.

chrome/browser/extensions/extension_function_test_utils.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 "chrome/browser/extensions/extension_function_test_utils.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "extensions/browser/api_test_utils.h"
 #include "extensions/browser/extension_function.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/id_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::WebContents;
 using extensions::Extension;
 using extensions::Manifest;
 namespace keys = extensions::tabs_constants;
@@ skipping 22 matching lines @@
 
 }  // namespace
 
 namespace extension_function_test_utils {
 
 base::Value* ParseJSON(const std::string& data) {
   return base::JSONReader::Read(data);
 }
 
 base::ListValue* ParseList(const std::string& data) {
-  scoped_ptr<base::Value> result(ParseJSON(data));
-  if (result.get() && result->IsType(base::Value::TYPE_LIST))
-    return static_cast<base::ListValue*>(result.release());
-  else
-    return NULL;
+  base::Value* result(ParseJSON(data));

[James Cook, 2014/07/18 20:32:48]

nit: I find "result = ParseJSON(data)" slightly easier to read.

[Yoyo Zhou, 2014/07/22 00:10:31]

Me too.

+  base::ListValue* list = NULL;
+  result->GetAsList(&list);
+  return list;
 }
 
 base::DictionaryValue* ParseDictionary(
     const std::string& data) {
   scoped_ptr<base::Value> result(ParseJSON(data));
   if (result.get() && result->IsType(base::Value::TYPE_DICTIONARY))
     return static_cast<base::DictionaryValue*>(result.release());
   else
     return NULL;
 }
@@ skipping 163 matching lines @@
 
  private:
   scoped_ptr<bool> response_;
   bool should_post_quit_;
 };
 
 bool RunFunction(UIThreadExtensionFunction* function,
                  const std::string& args,
                  Browser* browser,
                  RunFunctionFlags flags) {
-  SendResponseDelegate response_delegate;
-  function->set_test_delegate(&response_delegate);
-  scoped_ptr<base::ListValue> parsed_args(ParseList(args));
-  EXPECT_TRUE(parsed_args.get()) <<
-      "Could not parse extension function arguments: " << args;
-  function->SetArgs(parsed_args.get());
-
   TestFunctionDispatcherDelegate dispatcher_delegate(browser);
-  extensions::ExtensionFunctionDispatcher dispatcher(browser->profile(),
-                                                     &dispatcher_delegate);
-  function->set_dispatcher(dispatcher.AsWeakPtr());
-
-  function->set_browser_context(browser->profile());
-  function->set_include_incognito(flags & INCLUDE_INCOGNITO);
-  function->Run()->Execute();
-
-  // If the RunAsync of |function| didn't already call SendResponse, run the
-  // message loop until they do.
-  if (!response_delegate.HasResponse()) {
-    response_delegate.set_should_post_quit(true);
-    content::RunMessageLoop();
-  }
-
-  EXPECT_TRUE(response_delegate.HasResponse());
-  return response_delegate.GetResponse();
+  scoped_ptr<extensions::ExtensionFunctionDispatcher> dispatcher(
+      new extensions::ExtensionFunctionDispatcher(browser->profile(),
+                                                  &dispatcher_delegate));
+  // The cast is a hack; these flags should be defined in only one place.

[James Cook, 2014/07/18 20:32:48]

TODO(yoz) here

[Yoyo Zhou, 2014/07/22 00:10:31]

added

+  // See crbug.com/394840.
+  return extensions::api_test_utils::RunFunction(
+      function,
+      args,
+      browser->profile(),
+      dispatcher.Pass(),
+      static_cast<extensions::api_test_utils::RunFunctionFlags>(flags));
 }
 
 } // namespace extension_function_test_utils