Move DnsApiTest.DnsResolveIPLiteral and DnsApiTest.DnsResolveHostname to app_shell_browsertests.

extensions/browser/api/dns/mock_host_resolver_creator.cc

Index: extensions/browser/api/dns/mock_host_resolver_creator.cc
diff --git a/chrome/browser/extensions/api/dns/mock_host_resolver_creator.cc b/extensions/browser/api/dns/mock_host_resolver_creator.cc
similarity index 80%
rename from chrome/browser/extensions/api/dns/mock_host_resolver_creator.cc
rename to extensions/browser/api/dns/mock_host_resolver_creator.cc
index 5111c3ef061db5e68480541447d1c2ce56887dc1..873815b9bebefd94c1f5bd325601677091c0116b 100644
--- a/chrome/browser/extensions/api/dns/mock_host_resolver_creator.cc
+++ b/extensions/browser/api/dns/mock_host_resolver_creator.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h"
+#include "extensions/browser/api/dns/mock_host_resolver_creator.h"
 
-#include "chrome/test/base/in_process_browser_test.h"
+#include "base/logging.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/dns/mock_host_resolver.h"
 
@@ -16,19 +16,19 @@ const std::string MockHostResolverCreator::kHostname = "www.sowbug.com";
 const std::string MockHostResolverCreator::kAddress = "9.8.7.6";
 
 MockHostResolverCreator::MockHostResolverCreator()
-  : resolver_event_(true, false),
-    mock_host_resolver_(NULL) {
+    : resolver_event_(true, false), mock_host_resolver_(NULL) {
 }
 
 MockHostResolverCreator::~MockHostResolverCreator() {
 }
 
-net::MockHostResolver* MockHostResolverCreator::CreateMockHostResolver() {
+net::HostResolver* MockHostResolverCreator::CreateMockHostResolver() {
   DCHECK(!mock_host_resolver_);
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   bool result = BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
+      BrowserThread::IO,
+      FROM_HERE,
       base::Bind(&MockHostResolverCreator::CreateMockHostResolverOnIOThread,
                  this));
   DCHECK(result);
@@ -52,17 +52,18 @@ void MockHostResolverCreator::DeleteMockHostResolver() {
     return;
   resolver_event_.Reset();
   bool result = BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
+      BrowserThread::IO,
+      FROM_HERE,
       base::Bind(&MockHostResolverCreator::DeleteMockHostResolverOnIOThread,
                  this));
   DCHECK(result);
 
   base::TimeDelta max_time = base::TimeDelta::FromSeconds(5);
-  ASSERT_TRUE(resolver_event_.TimedWait(max_time));
+  CHECK(resolver_event_.TimedWait(max_time));
 }
 
 void MockHostResolverCreator::DeleteMockHostResolverOnIOThread() {
-  delete(mock_host_resolver_);
+  delete (mock_host_resolver_);
   mock_host_resolver_ = NULL;
   resolver_event_.Signal();
 }