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

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

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/browser/api/dns/mock_host_resolver_creator.h" 5 #include "extensions/browser/api/dns/mock_host_resolver_creator.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.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), mock_host_resolver_(NULL) { 19 : resolver_event_(true, false), mock_host_resolver_(nullptr) {
20 } 20 }
21 21
22 MockHostResolverCreator::~MockHostResolverCreator() { 22 MockHostResolverCreator::~MockHostResolverCreator() {
23 } 23 }
24 24
25 net::HostResolver* MockHostResolverCreator::CreateMockHostResolver() { 25 net::HostResolver* MockHostResolverCreator::CreateMockHostResolver() {
26 DCHECK(!mock_host_resolver_); 26 DCHECK(!mock_host_resolver_);
27 DCHECK_CURRENTLY_ON(BrowserThread::UI); 27 DCHECK_CURRENTLY_ON(BrowserThread::UI);
28 28
29 bool result = BrowserThread::PostTask( 29 bool result = BrowserThread::PostTask(
(...skipping 27 matching lines...) Expand all
57 base::Bind(&MockHostResolverCreator::DeleteMockHostResolverOnIOThread, 57 base::Bind(&MockHostResolverCreator::DeleteMockHostResolverOnIOThread,
58 this)); 58 this));
59 DCHECK(result); 59 DCHECK(result);
60 60
61 base::TimeDelta max_time = base::TimeDelta::FromSeconds(5); 61 base::TimeDelta max_time = base::TimeDelta::FromSeconds(5);
62 CHECK(resolver_event_.TimedWait(max_time)); 62 CHECK(resolver_event_.TimedWait(max_time));
63 } 63 }
64 64
65 void MockHostResolverCreator::DeleteMockHostResolverOnIOThread() { 65 void MockHostResolverCreator::DeleteMockHostResolverOnIOThread() {
66 delete (mock_host_resolver_); 66 delete (mock_host_resolver_);
67 mock_host_resolver_ = NULL; 67 mock_host_resolver_ = nullptr;
68 resolver_event_.Signal(); 68 resolver_event_.Signal();
69 } 69 }
70 70
71 } // namespace extensions 71 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698