Added cache flush on network change to ServiceDiscoveryHostClient

chrome/browser/local_discovery/service_discovery_host_client.cc

 // Copyright 2013 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/local_discovery/service_discovery_host_client.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif  // OS_POSIX
 
@@ skipping 174 matching lines @@
 uint64 ServiceDiscoveryHostClient::RegisterLocalDomainResolverCallback(
     const LocalDomainResolver::IPAddressCallback& callback) {
   DCHECK(CalledOnValidThread());
   DCHECK(!ContainsKey(domain_resolver_callbacks_, current_id_ + 1));
   domain_resolver_callbacks_[++current_id_] = callback;
   return current_id_;
 }
 
 void ServiceDiscoveryHostClient::UnregisterWatcherCallback(uint64 id) {
   DCHECK(CalledOnValidThread());
-  DCHECK(ContainsKey(service_watcher_callbacks_, id));
   service_watcher_callbacks_.erase(id);
 }
 
 void ServiceDiscoveryHostClient::UnregisterResolverCallback(uint64 id) {
   DCHECK(CalledOnValidThread());
-  DCHECK(ContainsKey(service_resolver_callbacks_, id));
   service_resolver_callbacks_.erase(id);
 }
 
 void ServiceDiscoveryHostClient::UnregisterLocalDomainResolverCallback(
     uint64 id) {
   DCHECK(CalledOnValidThread());
-  DCHECK(ContainsKey(domain_resolver_callbacks_, id));
   domain_resolver_callbacks_.erase(id);
 }
 
 void ServiceDiscoveryHostClient::Start() {
   DCHECK(CalledOnValidThread());
+  net::NetworkChangeNotifier::AddIPAddressObserver(this);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&ServiceDiscoveryHostClient::StartOnIOThread, this));
 }
 
 void ServiceDiscoveryHostClient::Shutdown() {
+  net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
   DCHECK(CalledOnValidThread());
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&ServiceDiscoveryHostClient::ShutdownOnIOThread, this));
 }
 
 void ServiceDiscoveryHostClient::StartOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   utility_host_ = UtilityProcessHost::Create(
@@ skipping 21 matching lines @@
 }
 
 void ServiceDiscoveryHostClient::ShutdownOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (utility_host_) {
     utility_host_->Send(new LocalDiscoveryMsg_ShutdownLocalDiscovery);
     utility_host_->EndBatchMode();
   }
 }
 
+void ServiceDiscoveryHostClient::RestartOnIOThread() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+
+  ShutdownOnIOThread();
+  StartOnIOThread();
+}
+
 void ServiceDiscoveryHostClient::Send(IPC::Message* msg) {
   DCHECK(CalledOnValidThread());
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&ServiceDiscoveryHostClient::SendOnIOThread, this, msg));
 }
 
 void ServiceDiscoveryHostClient::SendOnIOThread(IPC::Message* msg) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (utility_host_)
     utility_host_->Send(msg);
 }
 
+void ServiceDiscoveryHostClient::OnIPAddressChanged() {
+  BrowserThread::PostTask(
+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(&ServiceDiscoveryHostClient::RestartOnIOThread, this));
+
+  WatcherCallbacks service_watcher_callbacks;
+  service_watcher_callbacks_.swap(service_watcher_callbacks);
+
+  for (WatcherCallbacks::iterator i = service_watcher_callbacks.begin();
+       i != service_watcher_callbacks.end();) {

[Vitaly Buka (NO REVIEWS), 2013/09/07 00:27:51]

I see no reason to have i++; not in the for statement

[Noam Samuel, 2013/09/07 01:34:30]

Done.

+    ServiceWatcher::UpdatedCallback callback = i->second;
+    // i must be advanced before the callback is called in case the callback
+    // destroys the watcher proxy.
+    i++;
+    if (!callback.is_null()) {
+      callback.Run(ServiceWatcher::UPDATE_INVALIDATED, "");
+    }
+  }
+}
+
 bool ServiceDiscoveryHostClient::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ServiceDiscoveryHostClient, message)
     IPC_MESSAGE_HANDLER(LocalDiscoveryHostMsg_WatcherCallback,
                         OnWatcherCallback)
     IPC_MESSAGE_HANDLER(LocalDiscoveryHostMsg_ResolverCallback,
                         OnResolverCallback)
     IPC_MESSAGE_HANDLER(LocalDiscoveryHostMsg_LocalDomainResolverCallback,
                         OnLocalDomainResolverCallback)
@@ skipping 105 matching lines @@
 void ServiceDiscoveryHostClientFactory::ReleaseClientInternal() {
   DCHECK(CalledOnValidThread());
   references_--;
   if (references_ == 0) {
     instance_->Shutdown();
     instance_ = NULL;
   }
 }
 
 }  // namespace local_discovery