Merge FavoriteState into NetworkState

apps/shell/browser/shell_network_controller_chromeos.cc

 // Copyright 2014 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 "apps/shell/browser/shell_network_controller_chromeos.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
@@ skipping 107 matching lines @@
 
 // Attempts to connect to an available network if not already connecting or
 // connected.
 void ShellNetworkController::ConnectIfUnconnected() {
   chromeos::NetworkHandler* handler = chromeos::NetworkHandler::Get();
   DCHECK(handler);
   if (waiting_for_connection_result_ || IsConnectedOrConnecting())
     return;
 
   chromeos::NetworkStateHandler::NetworkStateList state_list;
-  handler->network_state_handler()->GetNetworkListByType(
+  handler->network_state_handler()->GetVisibleNetworkListByType(
       chromeos::NetworkTypePattern::WiFi(), &state_list);
   for (chromeos::NetworkStateHandler::NetworkStateList::const_iterator it =
        state_list.begin(); it != state_list.end(); ++it) {
     const chromeos::NetworkState* state = *it;
     DCHECK(state);
     if (!state->connectable())
       continue;
 
     VLOG(1) << "Connecting to network " << GetNetworkName(*state)
             << " with path " << state->path() << " and strength "
@@ skipping 19 matching lines @@
 }
 
 void ShellNetworkController::HandleConnectionError(
     const std::string& error_name,
     scoped_ptr<base::DictionaryValue> error_data) {
   LOG(WARNING) << "Unable to connect to network: " << error_name;
   waiting_for_connection_result_ = false;
 }
 
 }  // namespace apps