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

Side by Side Diff: net/dns/dns_config_service_win.cc

Issue 686963002: Switching profiler instrumentations from ScopedProfile to ScopedTracker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « net/disk_cache/cache_creator.cc ('k') | net/http/http_cache.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "net/dns/dns_config_service_win.h" 5 #include "net/dns/dns_config_service_win.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/files/file_path_watcher.h" 14 #include "base/files/file_path_watcher.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/metrics/histogram.h" 17 #include "base/metrics/histogram.h"
18 #include "base/profiler/scoped_profile.h" 18 #include "base/profiler/scoped_tracker.h"
19 #include "base/strings/string_split.h" 19 #include "base/strings/string_split.h"
20 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
21 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
22 #include "base/synchronization/lock.h" 22 #include "base/synchronization/lock.h"
23 #include "base/threading/non_thread_safe.h" 23 #include "base/threading/non_thread_safe.h"
24 #include "base/threading/thread_restrictions.h" 24 #include "base/threading/thread_restrictions.h"
25 #include "base/time/time.h" 25 #include "base/time/time.h"
26 #include "base/win/registry.h" 26 #include "base/win/registry.h"
27 #include "base/win/scoped_handle.h" 27 #include "base/win/scoped_handle.h"
28 #include "base/win/windows_version.h" 28 #include "base/win/windows_version.h"
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 DCHECK(callback_.is_null()); 303 DCHECK(callback_.is_null());
304 callback_ = callback; 304 callback_ = callback;
305 if (key_.Open(HKEY_LOCAL_MACHINE, key, KEY_NOTIFY) != ERROR_SUCCESS) 305 if (key_.Open(HKEY_LOCAL_MACHINE, key, KEY_NOTIFY) != ERROR_SUCCESS)
306 return false; 306 return false;
307 307
308 return key_.StartWatching(base::Bind(&RegistryWatcher::OnObjectSignaled, 308 return key_.StartWatching(base::Bind(&RegistryWatcher::OnObjectSignaled,
309 base::Unretained(this))); 309 base::Unretained(this)));
310 } 310 }
311 311
312 void OnObjectSignaled() { 312 void OnObjectSignaled() {
313 // TODO(vadimt): Remove ScopedProfile below once crbug.com/418183 is fixed. 313 // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed.
314 tracked_objects::ScopedProfile tracking_profile( 314 tracked_objects::ScopedTracker tracking_profile(
315 FROM_HERE_WITH_EXPLICIT_FUNCTION( 315 FROM_HERE_WITH_EXPLICIT_FUNCTION("RegistryWatcher_OnObjectSignaled"));
316 "RegistryWatcher_OnObjectSignaled"));
317 316
318 DCHECK(CalledOnValidThread()); 317 DCHECK(CalledOnValidThread());
319 DCHECK(!callback_.is_null()); 318 DCHECK(!callback_.is_null());
320 if (key_.StartWatching(base::Bind(&RegistryWatcher::OnObjectSignaled, 319 if (key_.StartWatching(base::Bind(&RegistryWatcher::OnObjectSignaled,
321 base::Unretained(this)))) { 320 base::Unretained(this)))) {
322 callback_.Run(true); 321 callback_.Run(true);
323 } else { 322 } else {
324 key_.Close(); 323 key_.Close();
325 callback_.Run(false); 324 callback_.Run(false);
326 } 325 }
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 } 758 }
760 759
761 } // namespace internal 760 } // namespace internal
762 761
763 // static 762 // static
764 scoped_ptr<DnsConfigService> DnsConfigService::CreateSystemService() { 763 scoped_ptr<DnsConfigService> DnsConfigService::CreateSystemService() {
765 return scoped_ptr<DnsConfigService>(new internal::DnsConfigServiceWin()); 764 return scoped_ptr<DnsConfigService>(new internal::DnsConfigServiceWin());
766 } 765 }
767 766
768 } // namespace net 767 } // namespace net
OLDNEW
« no previous file with comments | « net/disk_cache/cache_creator.cc ('k') | net/http/http_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698