[cros/net] Add DnsConfigService to NetworkChangeNotifierChromeos.

chrome/browser/chromeos/net/network_change_notifier_chromeos.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.
 
 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
 
 #include "base/bind.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
+#include "net/dns/dns_config_service_posix.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Delay for online change notification reporting.
 const int kOnlineNotificationDelayMS = 500;
 const int kInitialNotificationCheckDelayMS = 1000;
 
 bool IsOnline(chromeos::ConnectionState state) {
   return state == chromeos::STATE_ONLINE ||
          state == chromeos::STATE_PORTAL;
 }
 
 }
 
 namespace chromeos {
 
+class NetworkChangeNotifierChromeos::DnsConfigServiceChromeos
+    : public net::internal::DnsConfigServicePosix {
+ public:
+  DnsConfigServiceChromeos() {}
+
+  virtual ~DnsConfigServiceChromeos() {}
+
+  // net::DnsConfigServicePosix:
+  virtual bool StartWatching() OVERRIDE {
+    // Notifications from NetworkLibrary are sent to
+    // NetworkChangeNotifierChromeos.
+    return true;
+  }
+
+  void OnNetworkChange() {
+    InvalidateConfig();
+    InvalidateHosts();
+    ReadNow();
+  }
+};
+
 NetworkChangeNotifierChromeos::NetworkChangeNotifierChromeos()
     : has_active_network_(false),
       connection_state_(chromeos::STATE_UNKNOWN),
       connection_type_(CONNECTION_NONE),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   BrowserThread::PostDelayedTask(
          BrowserThread::UI, FROM_HERE,
          base::Bind(
              &NetworkChangeNotifierChromeos::UpdateInitialState, this),
          base::TimeDelta::FromMilliseconds(kInitialNotificationCheckDelayMS));
 }
 
 NetworkChangeNotifierChromeos::~NetworkChangeNotifierChromeos() {
 }
 
 void NetworkChangeNotifierChromeos::Init() {
   chromeos::NetworkLibrary* network_library =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   network_library->AddNetworkManagerObserver(this);
 
   DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
 
+  dns_config_service_.reset(new DnsConfigServiceChromeos());
+  dns_config_service_->WatchConfig(
+      base::Bind(NetworkChangeNotifier::SetDnsConfig));
+
   UpdateNetworkState(network_library);
 }
 
 void NetworkChangeNotifierChromeos::Shutdown() {
   weak_factory_.InvalidateWeakPtrs();
 
+  dns_config_service_.reset();
+
   if (!chromeos::CrosLibrary::Get())
     return;
 
   chromeos::NetworkLibrary* lib =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   lib->RemoveNetworkManagerObserver(this);
   lib->RemoveObserverForAllNetworks(this);
 
   DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
 }
@@ skipping 53 matching lines @@
       lib->RemoveObserverForAllNetworks(this);
     if (!network) {
       has_active_network_ = false;
       service_path_.clear();
       ip_address_.clear();
     } else {
       has_active_network_ = true;
       service_path_ = network->service_path();
       ip_address_ = network->ip_address();
     }
+    // TODO(szym): detect user DNS changes. http://crbug.com/148394
+    dns_config_service_->OnNetworkChange();
     UpdateConnectivityState(network);
     // If there is an active network, add observer to track its changes.
     if (network)
       lib->AddNetworkObserver(network->service_path(), this);
 
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(
             &NetworkChangeNotifier::NotifyObserversOfIPAddressChange));
   }
@@ skipping 113 matching lines @@
       }
     case chromeos::TYPE_BLUETOOTH:
     case chromeos::TYPE_VPN:
     case chromeos::TYPE_UNKNOWN:
       break;
   }
   return net::NetworkChangeNotifier::CONNECTION_UNKNOWN;
 }
 
 }  // namespace chromeos