Merge requested by sheriff kliegs to fix chromeos test redness.

chrome/browser/chromeos/web_socket_proxy_controller.cc

 // Copyright (c) 2011 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>
 #include <unistd.h>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/string_tokenizer.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/web_socket_proxy.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
 #include "content/common/url_constants.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/network_change_notifier.h"
 
 namespace {
 
 const char* kAllowedIds[] = {
     "haiffjcadagjlijoggckpgfnoeiflnem",
     "gnedhmakppccajfpfiihfcdlnpgomkcf",
     "fjcibdnjlbfnbfdjneajpipnlcppleek",
     "okddffdblfhhnmhodogpojmfkjmhinfp"
 };
 
@@ skipping 56 matching lines @@
   std::vector<std::string> allowed_ids_;
   std::vector<std::string> allowed_origins_;
 };
 
 base::LazyInstance<OriginValidator> g_validator(base::LINKER_INITIALIZED);
 
 class ProxyTask : public Task {
   virtual void Run() OVERRIDE;
 };
 
-class ProxyLifetime : public NotificationObserver {
+class ProxyLifetime : public net::NetworkChangeNotifier::OnlineStateObserver {
  public:
   ProxyLifetime() : delay_ms_(1000), shutdown_requested_(false) {
     BrowserThread::PostTask(
         BrowserThread::WEB_SOCKET_PROXY, FROM_HERE, new ProxyTask());
-    registrar_.Add(this, chrome::NOTIFICATION_NETWORK_STATE_CHANGED,
-                   NotificationService::AllSources());
+    net::NetworkChangeNotifier::AddOnlineStateObserver(this);
+  }
+
+  virtual ~ProxyLifetime() {
+    net::NetworkChangeNotifier::RemoveOnlineStateObserver(this);
   }
 
  private:
-  virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details) {
-    DCHECK_EQ(type, chrome::NOTIFICATION_NETWORK_STATE_CHANGED);
+  // net::NetworkChangeNotifier::OnlineStateObserver overrides.
+  virtual void OnOnlineStateChanged(bool online) OVERRIDE {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(chromeos::WebSocketProxyController::IsInitiated());
     base::AutoLock alk(lock_);
     if (server_)
       server_->OnNetworkChange();
   }
 
   // Delay between next attempt to run proxy.
   int delay_ms_;
 
   chromeos::WebSocketProxy* volatile server_;
@@ skipping 79 matching lines @@
 bool WebSocketProxyController::CheckCredentials(
     const std::string& extension_id,
     const std::string& hostname,
     unsigned short port,
     ConnectionFlags flags) {
   return g_validator.Get().CheckCredentials(
       extension_id, hostname, port, flags);
 }
 
 }  // namespace chromeos