[net] Move DnsConfigService to NetworkChangeNotifier.

net/base/network_change_notifier_linux.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This implementation of NetworkChangeNotifier's offline state detection
 // depends on D-Bus and NetworkManager, and is known to work on at least
 // GNOME version 2.30.  If D-Bus or NetworkManager are unavailable, this
 // implementation will always behave as if it is online.
 
 #include "net/base/network_change_notifier_linux.h"
 
 #include <resolv.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 #include "net/base/address_tracker_linux.h"
 #include "net/base/net_errors.h"
-#include "net/dns/dns_config_watcher.h"
+#include "net/dns/dns_config_service.h"
 
 namespace net {
 
 namespace {
 
 const char kNetworkManagerServiceName[] = "org.freedesktop.NetworkManager";
 const char kNetworkManagerPath[] = "/org/freedesktop/NetworkManager";
 const char kNetworkManagerInterface[] = "org.freedesktop.NetworkManager";
 
 // http://projects.gnome.org/NetworkManager/developers/spec-08.html#type-NM_STATE
@@ skipping 215 matching lines @@
 
  protected:
   // base::Thread
   virtual void Init() OVERRIDE;
   virtual void CleanUp() OVERRIDE;
 
  private:
   // Used to detect online/offline state changes.
   NetworkManagerApi network_manager_api_;
 
-  internal::DnsConfigWatcher dns_watcher_;
+  scoped_ptr<DnsConfigService> dns_config_service_;
   internal::AddressTrackerLinux address_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(Thread);
 };
 
 NetworkChangeNotifierLinux::Thread::Thread(dbus::Bus* bus)
     : base::Thread("NetworkChangeNotifier"),
       network_manager_api_(
           base::Bind(&NetworkChangeNotifier::
                      NotifyObserversOfConnectionTypeChange),
           bus),
       address_tracker_(
           base::Bind(&NetworkChangeNotifier::
                      NotifyObserversOfIPAddressChange)) {
 }
 
 NetworkChangeNotifierLinux::Thread::~Thread() {
   DCHECK(!Thread::IsRunning());
 }
 
 void NetworkChangeNotifierLinux::Thread::Init() {
   network_manager_api_.Init();
-  dns_watcher_.Init();
+  dns_config_service_ = DnsConfigService::CreateSystemService();
+  dns_config_service_->WatchConfig(
+      base::Bind(&NetworkChangeNotifier::SetDnsConfig));
   address_tracker_.Init();
 }
 
 void NetworkChangeNotifierLinux::Thread::CleanUp() {
   network_manager_api_.CleanUp();
-  dns_watcher_.CleanUp();
+  dns_config_service_.reset();
 }
 
 NetworkChangeNotifierLinux* NetworkChangeNotifierLinux::Create() {
   return new NetworkChangeNotifierLinux(NULL);
 }
 
 NetworkChangeNotifierLinux* NetworkChangeNotifierLinux::CreateForTest(
     dbus::Bus* bus) {
   return new NetworkChangeNotifierLinux(bus);
 }
@@ skipping 17 matching lines @@
 NetworkChangeNotifierLinux::GetCurrentConnectionType() const {
   return notifier_thread_->GetCurrentConnectionType();
 }
 
 const internal::AddressTrackerLinux*
 NetworkChangeNotifierLinux::GetAddressTrackerInternal() const {
   return notifier_thread_->address_tracker();
 }
 
 }  // namespace net