Revert accidental dartium code push

net/base/network_change_notifier_win.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_win.h"
 
 #include <iphlpapi.h>
 #include <winsock2.h>
 
 #include "base/bind.h"
@@ skipping 36 matching lines @@
 
  private:
   scoped_ptr<DnsConfigService> service_;
 
   DISALLOW_COPY_AND_ASSIGN(DnsConfigServiceThread);
 };
 
 NetworkChangeNotifierWin::NetworkChangeNotifierWin()
     : NetworkChangeNotifier(NetworkChangeCalculatorParamsWin()),
       is_watching_(false),
-          network_change_event_handle_(NULL),
       sequential_failures_(0),
       weak_factory_(this),
       dns_config_service_thread_(new DnsConfigServiceThread()),
       last_computed_connection_type_(RecomputeCurrentConnectionType()),
       last_announced_offline_(
           last_computed_connection_type_ == CONNECTION_NONE) {
   memset(&addr_overlapped_, 0, sizeof addr_overlapped_);
   addr_overlapped_.hEvent = WSACreateEvent();
 }
 
@@ skipping 148 matching lines @@
     ConnectionType connection_type) {
   base::AutoLock auto_lock(last_computed_connection_type_lock_);
   last_computed_connection_type_ = connection_type;
 }
 
 void NetworkChangeNotifierWin::OnObjectSignaled(HANDLE object) {
   DCHECK(CalledOnValidThread());
   DCHECK(is_watching_);
   is_watching_ = false;
 
-  DWORD bytes;
-  BOOL network_changed = GetOverlappedResult(network_change_event_handle_, &addr_overlapped_, &bytes, TRUE);
-
   // Start watching for the next address change.
   WatchForAddressChange();
 
-  // If network_changed is 0 an error occured (e.g. GetLastError() = 995 = ERROR_OPERATION_ABORTED).
-  if (network_changed != 0)
-    NotifyObservers();
+  NotifyObservers();
 }
 
 void NetworkChangeNotifierWin::NotifyObservers() {
   DCHECK(CalledOnValidThread());
   SetCurrentConnectionType(RecomputeCurrentConnectionType());
   NotifyObserversOfIPAddressChange();
 
   // Calling GetConnectionType() at this very moment is likely to give
   // the wrong result, so we delay that until a little bit later.
   //
@@ skipping 49 matching lines @@
 }
 
 bool NetworkChangeNotifierWin::WatchForAddressChangeInternal() {
   DCHECK(CalledOnValidThread());
 
   if (!dns_config_service_thread_->IsRunning()) {
     dns_config_service_thread_->StartWithOptions(
       base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
   }
 
-
-  DWORD ret = NotifyAddrChange(&network_change_event_handle_, &addr_overlapped_);
+  HANDLE handle = NULL;
+  DWORD ret = NotifyAddrChange(&handle, &addr_overlapped_);
   if (ret != ERROR_IO_PENDING)
     return false;
 
   addr_watcher_.StartWatching(addr_overlapped_.hEvent, this);
   return true;
 }
 
 void NetworkChangeNotifierWin::NotifyParentOfConnectionTypeChange() {
   SetCurrentConnectionType(RecomputeCurrentConnectionType());
   bool current_offline = IsOffline();
   offline_polls_++;
   // If we continue to appear offline, delay sending out the notification in
   // case we appear to go online within 20 seconds.  UMA histogram data shows
   // we may not detect the transition to online state after 1 second but within
   // 20 seconds we generally do.
   if (last_announced_offline_ && current_offline && offline_polls_ <= 20) {
     timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(1), this,
                  &NetworkChangeNotifierWin::NotifyParentOfConnectionTypeChange);
     return;
   }
   if (last_announced_offline_)
     UMA_HISTOGRAM_CUSTOM_COUNTS("NCN.OfflinePolls", offline_polls_, 1, 50, 50);
   last_announced_offline_ = current_offline;
 
   NotifyObserversOfConnectionTypeChange();
 }
 
 }  // namespace net