| Index: chrome/browser/extensions/api/dns/dns_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/dns/dns_apitest.cc b/chrome/browser/extensions/api/dns/dns_apitest.cc
|
| index 508a9aad3c13ee197e95af1ae2bd103e3bfc4dec..3c97302be70e48cc9a571c85576dc89a0d0c0cda 100644
|
| --- a/chrome/browser/extensions/api/dns/dns_apitest.cc
|
| +++ b/chrome/browser/extensions/api/dns/dns_apitest.cc
|
| @@ -2,13 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/command_line.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "chrome/browser/extensions/api/dns/dns_api.h"
|
| #include "chrome/browser/extensions/extension_apitest.h"
|
| #include "chrome/browser/extensions/extension_function_test_utils.h"
|
| -#include "chrome/common/chrome_switches.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "net/base/host_resolver.h"
|
| #include "net/base/mock_host_resolver.h"
|
| @@ -21,7 +19,7 @@ using extension_function_test_utils::RunFunctionAndReturnResult;
|
|
|
| namespace {
|
|
|
| -class DnsApiTest : public ExtensionApiTest {
|
| +class DnsApiTest : public PlatformAppApiTest {
|
| public:
|
| static const std::string kHostname;
|
| static const std::string kAddress;
|
| @@ -30,12 +28,6 @@ class DnsApiTest : public ExtensionApiTest {
|
| mock_host_resolver_(NULL) {
|
| }
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| - ExtensionApiTest::SetUpCommandLine(command_line);
|
| - command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
|
| - command_line->AppendSwitch(switches::kEnablePlatformApps);
|
| - }
|
| -
|
| virtual void SetUpOnMainThread() OVERRIDE {
|
| CreateMockHostResolverOnIOThread();
|
| extensions::DnsResolveFunction::set_host_resolver_for_testing(
|
| @@ -105,6 +97,10 @@ const std::string DnsApiTest::kAddress = "9.8.7.6";
|
|
|
| } // namespace
|
|
|
| +IN_PROC_BROWSER_TEST_F(DnsApiTest, VerifyPermissions) {
|
| + VerifyPermissions(test_data_dir_.AppendASCII("dns/api"));
|
| +}
|
| +
|
| IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveIPLiteral) {
|
| scoped_refptr<extensions::DnsResolveFunction> resolve_function(
|
| new extensions::DnsResolveFunction());
|
|
|