| Index: net/dns/dns_config_service.h
|
| diff --git a/net/dns/dns_config_service.h b/net/dns/dns_config_service.h
|
| index e0fd54a6f3bd490c0b3ae85e133dc50bec5fe8a5..d8845d1b223853e122816904a1e2da77c40af5c5 100644
|
| --- a/net/dns/dns_config_service.h
|
| +++ b/net/dns/dns_config_service.h
|
| @@ -12,7 +12,7 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_vector.h"
|
| -#include "base/threading/non_thread_safe.h"
|
| +#include "base/threading/thread_checker.h"
|
| #include "base/time/time.h"
|
| #include "base/timer/timer.h"
|
| // Needed on shared build with MSVS2010 to avoid multiple definitions of
|
| @@ -92,8 +92,7 @@ struct NET_EXPORT_PRIVATE DnsConfig {
|
|
|
| // Service for reading system DNS settings, on demand or when signalled by
|
| // internal watchers and NetworkChangeNotifier.
|
| -class NET_EXPORT_PRIVATE DnsConfigService
|
| - : NON_EXPORTED_BASE(public base::NonThreadSafe) {
|
| +class NET_EXPORT_PRIVATE DnsConfigService {
|
| public:
|
| // Callback interface for the client, called on the same thread as
|
| // ReadConfig() and WatchConfig().
|
| @@ -142,6 +141,8 @@ class NET_EXPORT_PRIVATE DnsConfigService
|
|
|
| void set_watch_failed(bool value) { watch_failed_ = value; }
|
|
|
| + THREAD_CHECKER(thread_checker_);
|
| +
|
| private:
|
| // The timer counts from the last Invalidate* until complete config is read.
|
| void StartTimer();
|
|
|