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

Side by Side Diff: net/base/dns_reload_timer.cc

Issue 7833030: Revert 99666 (sync tests started failing on mac10.6: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « net/base/dns_reload_timer.h ('k') | net/base/dns_reloader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/base/dns_reload_timer.h" 5 #include "net/base/dns_reload_timer.h"
6 6
7 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) 7 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/threading/thread_local_storage.h" 9 #include "base/threading/thread_local_storage.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 namespace net { 91 namespace net {
92 92
93 bool DnsReloadTimerHasExpired() { 93 bool DnsReloadTimerHasExpired() {
94 DnsReloadTimer* dns_timer = g_dns_reload_timer.Pointer(); 94 DnsReloadTimer* dns_timer = g_dns_reload_timer.Pointer();
95 return dns_timer->Expired(); 95 return dns_timer->Expired();
96 } 96 }
97 97
98 } // namespace net 98 } // namespace net
99 99
100 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) 100 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
OLDNEW
« no previous file with comments | « net/base/dns_reload_timer.h ('k') | net/base/dns_reloader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698