Chromium Code Reviews| 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 86% |
| 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..e05baf9db83de9c223e803c48ba134a3f3b68797 100644 |
| --- a/chrome/browser/extensions/api/dns/mock_host_resolver_creator.cc |
| +++ b/extensions/browser/api/dns/mock_host_resolver_creator.cc |
| @@ -2,11 +2,11 @@ |
| // 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 "content/public/browser/browser_thread.h" |
| #include "net/dns/mock_host_resolver.h" |
| +#include "testing/gtest/include/gtest/gtest.h" |
|
James Cook
2014/07/16 17:15:31
optional: Do you even need this? You could replace
Yoyo Zhou
2014/07/18 02:45:31
Yeah, CHECK seems better.
|
| using content::BrowserThread; |
| @@ -16,8 +16,7 @@ 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() { |
| @@ -28,7 +27,8 @@ net::MockHostResolver* MockHostResolverCreator::CreateMockHostResolver() { |
| 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,7 +52,8 @@ 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); |
| @@ -62,7 +63,7 @@ void MockHostResolverCreator::DeleteMockHostResolver() { |
| } |
| void MockHostResolverCreator::DeleteMockHostResolverOnIOThread() { |
| - delete(mock_host_resolver_); |
| + delete (mock_host_resolver_); |
| mock_host_resolver_ = NULL; |
| resolver_event_.Signal(); |
| } |