Avoid initial NetworkChangeNotifier OnDNSChanged() signal on Android

net/base/network_change_notifier.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 "net/base/network_change_notifier.h"
 
 #include <limits>
 
 #include "base/metrics/histogram.h"
 #include "base/synchronization/lock.h"
@@ skipping 758 matching lines @@
 }
 
 // static
 void NetworkChangeNotifier::NotifyObserversOfNetworkChangeForTests(
     ConnectionType type) {
   if (g_network_change_notifier)
     g_network_change_notifier->NotifyObserversOfNetworkChangeImpl(type);
 }
 
 // static
+void NetworkChangeNotifier::NotifyObserversOfInitialDNSConfigReadForTests() {
+  if (g_network_change_notifier)
+    g_network_change_notifier->NotifyObserversOfInitialDNSConfigReadImpl();
+}
+
+// static
 void NetworkChangeNotifier::SetTestNotificationsOnly(bool test_only) {
   if (g_network_change_notifier)
     g_network_change_notifier->test_notifications_only_ = test_only;
 }
 
 NetworkChangeNotifier::NetworkChangeNotifier(
     const NetworkChangeCalculatorParams& params
     /*= NetworkChangeCalculatorParams()*/)
     : ip_address_observer_list_(new ObserverListThreadSafe<IPAddressObserver>(
           ObserverListBase<IPAddressObserver>::NOTIFY_EXISTING_ONLY)),
@@ skipping 145 matching lines @@
 
 // static
 void NetworkChangeNotifier::NotifyObserversOfDNSChange() {
   if (g_network_change_notifier &&
       !g_network_change_notifier->test_notifications_only_) {
     g_network_change_notifier->NotifyObserversOfDNSChangeImpl();
   }
 }
 
 // static
+void NetworkChangeNotifier::NotifyObserversOfInitialDNSConfigRead() {
+  if (g_network_change_notifier &&
+      !g_network_change_notifier->test_notifications_only_) {
+    g_network_change_notifier->NotifyObserversOfInitialDNSConfigReadImpl();
+  }
+}
+
+// static
 void NetworkChangeNotifier::SetDnsConfig(const DnsConfig& config) {
   if (!g_network_change_notifier)
     return;
   g_network_change_notifier->network_state_->SetDnsConfig(config);
   NotifyObserversOfDNSChange();
 }
 
+// static
+void NetworkChangeNotifier::SetInitialDnsConfig(const DnsConfig& config) {
+  if (!g_network_change_notifier)
+    return;
+#if DCHECK_IS_ON()
+  // Verify we've never received a valid DnsConfig previously.
+  DnsConfig old_config;
+  g_network_change_notifier->network_state_->GetDnsConfig(&old_config);
+  DCHECK(!old_config.IsValid());
+#endif
+  g_network_change_notifier->network_state_->SetDnsConfig(config);
+  NotifyObserversOfInitialDNSConfigRead();
+}
+
 void NetworkChangeNotifier::NotifyObserversOfIPAddressChangeImpl() {
   ip_address_observer_list_->Notify(FROM_HERE,
                                     &IPAddressObserver::OnIPAddressChanged);
 }
 
 void NetworkChangeNotifier::NotifyObserversOfConnectionTypeChangeImpl(
     ConnectionType type) {
   connection_type_observer_list_->Notify(
       FROM_HERE, &ConnectionTypeObserver::OnConnectionTypeChanged, type);
 }
 
 void NetworkChangeNotifier::NotifyObserversOfNetworkChangeImpl(
     ConnectionType type) {
   network_change_observer_list_->Notify(
       FROM_HERE, &NetworkChangeObserver::OnNetworkChanged, type);
 }
 
 void NetworkChangeNotifier::NotifyObserversOfDNSChangeImpl() {
   resolver_state_observer_list_->Notify(FROM_HERE, &DNSObserver::OnDNSChanged);
 }
 
+void NetworkChangeNotifier::NotifyObserversOfInitialDNSConfigReadImpl() {
+  resolver_state_observer_list_->Notify(FROM_HERE,
+                                        &DNSObserver::OnInitialDNSConfigRead);
+}
+
 void NetworkChangeNotifier::NotifyObserversOfMaxBandwidthChangeImpl(
     double max_bandwidth_mbps) {
   max_bandwidth_observer_list_->Notify(
       FROM_HERE, &MaxBandwidthObserver::OnMaxBandwidthChanged,
       max_bandwidth_mbps);
 }
 
 NetworkChangeNotifier::DisableForTest::DisableForTest()
     : network_change_notifier_(g_network_change_notifier) {
   DCHECK(g_network_change_notifier);
   g_network_change_notifier = NULL;
 }
 
 NetworkChangeNotifier::DisableForTest::~DisableForTest() {
   DCHECK(!g_network_change_notifier);
   g_network_change_notifier = network_change_notifier_;
 }
 
+void NetworkChangeNotifier::DNSObserver::OnInitialDNSConfigRead() {
+}
+
 }  // namespace net