Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

chrome/browser/chromeos/web_socket_proxy_controller.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/web_socket_proxy_controller.h"
 
 #include <algorithm>
 
 #include <netinet/in.h>
 #include <sys/wait.h>
@@ skipping 15 matching lines @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/network_change_notifier.h"
 
 namespace {
 
 class ProxyLifetime
-    : public net::NetworkChangeNotifier::ConnectionTypeObserver,
+    : public net::NetworkChangeNotifier::NetworkChangeObserver,
       public content::NotificationObserver {
  public:
   ProxyLifetime()
       : delay_ms_(1000),
         port_(-1),
         shutdown_requested_(false),
         web_socket_proxy_thread_("Chrome_WebSocketproxyThread") {
     DLOG(INFO) << "WebSocketProxyController initiation";
     base::Thread::Options options(MessageLoop::TYPE_IO, 0);
     web_socket_proxy_thread_.StartWithOptions(options);
     web_socket_proxy_thread_.message_loop()->PostTask(
         FROM_HERE,
         base::Bind(&ProxyLifetime::ProxyCallback, base::Unretained(this)));
-    net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
+    net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
     registrar_.Add(
         this, chrome::NOTIFICATION_WEB_SOCKET_PROXY_STARTED,
         content::NotificationService::AllSources());
   }
 
   virtual ~ProxyLifetime() {
-    net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
+    net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
   }
 
   virtual void Observe(int type, const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     base::AutoLock alk(lock_);
     port_ = *content::Details<int>(details).ptr();
   }
 
   int GetPort() {
     base::AutoLock alk(lock_);
     return port_;
   }
 
  private:
-  // net::NetworkChangeNotifier::ConnectionTypeObserver implementation.
-  virtual void OnConnectionTypeChanged(
+  // net::NetworkChangeNotifier::NetworkChangeObserver implementation.
+  virtual void OnNetworkChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE {
+    if (type != net::NetworkChangeNotifier::CONNECTION_NONE)
+      return;

[szym, 2013/01/20 06:52:08]

This filters out changes online -> offline. Are you sure this is right?

     DCHECK(chromeos::WebSocketProxyController::IsInitiated());
     base::AutoLock alk(lock_);
     if (server_)
       server_->OnNetworkChange();
   }
 
   void ProxyCallback() {
     LOG(INFO) << "Attempt to run web socket proxy task";
     chromeos::WebSocketProxy* server = new chromeos::WebSocketProxy();
     {
@@ skipping 68 matching lines @@
   {
     base::AutoLock alk(g_proxy_lifetime.Get().lock_);
     g_proxy_lifetime.Get().shutdown_requested_ = true;
     if (g_proxy_lifetime.Get().server_)
       g_proxy_lifetime.Get().server_->Shutdown();
   }
   g_proxy_lifetime.Get().web_socket_proxy_thread_.Stop();
 }
 
 }  // namespace chromeos