Merge 149283 - This fixes connecting to hidden networks by not marking

chrome/browser/chromeos/cros/network_library.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/cros/network_library.h"
 
 #include <dbus/dbus-glib.h>
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 270 matching lines @@
   return new Network("fake_service_path", type);
 }
 
 void Network::SetState(ConnectionState new_state) {
   if (new_state == state_)
     return;
   if (state_ == STATE_CONNECT_REQUESTED && new_state == STATE_IDLE) {
     // CONNECT_REQUESTED is set internally. Shill/flimflam do not update the
     // state immediately, so ignore any Idle state updates sent while a
     // connection attempt is in progress.
+    VLOG(2) << "Ignoring idle state change after connection request.";
     return;
   }
   ConnectionState old_state = state_;
+  VLOG(2) << "Entering new state: " << ConnectionStateString(new_state);
   state_ = new_state;
   if (!IsConnectingState(new_state))
     set_connection_started(false);
   if (new_state == STATE_FAILURE) {
+    VLOG(2) << "Detected Failure state.";
     if (old_state != STATE_UNKNOWN &&
         old_state != STATE_IDLE) {
       // New failure, the user needs to be notified.
       // Transition STATE_IDLE -> STATE_FAILURE sometimes happens on resume
       // but is not an actual failure as network device is not ready yet.
       notify_failure_ = true;
       // Normally error_ should be set, but if it is not we need to set it to
       // something here so that the retry logic will be triggered.
-      if (error_ == ERROR_NO_ERROR)
+      if (error_ == ERROR_NO_ERROR) {
+        VLOG(2) << "Detected NO_ERROR error state.  Setting to UNKNOWN.";
         error_ = ERROR_UNKNOWN;
+      }
     }
   } else {
     // State changed, so refresh IP address.
     // Note: blocking DBus call. TODO(stevenjb): refactor this.
     InitIPAddress();
   }
   VLOG(1) << name() << ".State [" << service_path() << "]: " << GetStateString()
           << " (was: " << ConnectionStateString(old_state) << ")";
 }
 
@@ skipping 994 matching lines @@
   NetworkLibrary* impl;
   if (stub)
     impl = new NetworkLibraryImplStub();
   else
     impl = new NetworkLibraryImplCros();
   impl->Init();
   return impl;
 }
 
 }  // namespace chromeos