Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(439)

Side by Side Diff: chrome/browser/extensions/api/dns/mock_host_resolver_creator.cc

Issue 216513002: Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h" 5 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h"
6 6
7 #include "chrome/test/base/in_process_browser_test.h" 7 #include "chrome/test/base/in_process_browser_test.h"
8 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
9 #include "net/dns/mock_host_resolver.h" 9 #include "net/dns/mock_host_resolver.h"
10 10
11 using content::BrowserThread; 11 using content::BrowserThread;
12 12
13 namespace extensions { 13 namespace extensions {
14 14
15 const std::string MockHostResolverCreator::kHostname = "www.sowbug.com"; 15 const std::string MockHostResolverCreator::kHostname = "www.sowbug.com";
16 const std::string MockHostResolverCreator::kAddress = "9.8.7.6"; 16 const std::string MockHostResolverCreator::kAddress = "9.8.7.6";
17 17
18 MockHostResolverCreator::MockHostResolverCreator() 18 MockHostResolverCreator::MockHostResolverCreator()
19 : resolver_event_(true, false), 19 : resolver_event_(true, false),
20 mock_host_resolver_(NULL) { 20 mock_host_resolver_(NULL) {
21 } 21 }
22 22
23 MockHostResolverCreator::~MockHostResolverCreator() { 23 MockHostResolverCreator::~MockHostResolverCreator() {
24 } 24 }
25 25
26 net::MockHostResolver* MockHostResolverCreator::CreateMockHostResolver() { 26 net::MockHostResolver* MockHostResolverCreator::CreateMockHostResolver() {
27 DCHECK(!mock_host_resolver_); 27 DCHECK(!mock_host_resolver_);
28 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 28 DCHECK_CURRENTLY_ON(BrowserThread::UI);
29 29
30 bool result = BrowserThread::PostTask( 30 bool result = BrowserThread::PostTask(
31 BrowserThread::IO, FROM_HERE, 31 BrowserThread::IO, FROM_HERE,
32 base::Bind(&MockHostResolverCreator::CreateMockHostResolverOnIOThread, 32 base::Bind(&MockHostResolverCreator::CreateMockHostResolverOnIOThread,
33 this)); 33 this));
34 DCHECK(result); 34 DCHECK(result);
35 35
36 base::TimeDelta max_time = base::TimeDelta::FromSeconds(5); 36 base::TimeDelta max_time = base::TimeDelta::FromSeconds(5);
37 resolver_event_.TimedWait(max_time); 37 resolver_event_.TimedWait(max_time);
38 38
39 return mock_host_resolver_; 39 return mock_host_resolver_;
40 } 40 }
41 41
42 void MockHostResolverCreator::CreateMockHostResolverOnIOThread() { 42 void MockHostResolverCreator::CreateMockHostResolverOnIOThread() {
43 mock_host_resolver_ = new net::MockHostResolver(); 43 mock_host_resolver_ = new net::MockHostResolver();
44 mock_host_resolver_->rules()->AddRule(kHostname, kAddress); 44 mock_host_resolver_->rules()->AddRule(kHostname, kAddress);
45 mock_host_resolver_->rules()->AddSimulatedFailure("this.hostname.is.bogus"); 45 mock_host_resolver_->rules()->AddSimulatedFailure("this.hostname.is.bogus");
46 resolver_event_.Signal(); 46 resolver_event_.Signal();
47 } 47 }
48 48
49 void MockHostResolverCreator::DeleteMockHostResolver() { 49 void MockHostResolverCreator::DeleteMockHostResolver() {
50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 50 DCHECK_CURRENTLY_ON(BrowserThread::UI);
51 if (!mock_host_resolver_) 51 if (!mock_host_resolver_)
52 return; 52 return;
53 resolver_event_.Reset(); 53 resolver_event_.Reset();
54 bool result = BrowserThread::PostTask( 54 bool result = BrowserThread::PostTask(
55 BrowserThread::IO, FROM_HERE, 55 BrowserThread::IO, FROM_HERE,
56 base::Bind(&MockHostResolverCreator::DeleteMockHostResolverOnIOThread, 56 base::Bind(&MockHostResolverCreator::DeleteMockHostResolverOnIOThread,
57 this)); 57 this));
58 DCHECK(result); 58 DCHECK(result);
59 59
60 base::TimeDelta max_time = base::TimeDelta::FromSeconds(5); 60 base::TimeDelta max_time = base::TimeDelta::FromSeconds(5);
61 ASSERT_TRUE(resolver_event_.TimedWait(max_time)); 61 ASSERT_TRUE(resolver_event_.TimedWait(max_time));
62 } 62 }
63 63
64 void MockHostResolverCreator::DeleteMockHostResolverOnIOThread() { 64 void MockHostResolverCreator::DeleteMockHostResolverOnIOThread() {
65 delete(mock_host_resolver_); 65 delete(mock_host_resolver_);
66 mock_host_resolver_ = NULL; 66 mock_host_resolver_ = NULL;
67 resolver_event_.Signal(); 67 resolver_event_.Signal();
68 } 68 }
69 69
70 } // namespace extensions 70 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/dial/dial_api.cc ('k') | chrome/browser/extensions/api/downloads/downloads_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698