Add ConnectToBestServices call when Certs are loaded

chrome/browser/chromeos/network_login_observer.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/network_login_observer.h"
 
+#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/shill_manager_client.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace chromeos {
 
+namespace {
+
+void ShillErrorCallback(const std::string& error_name,
+                        const std::string& error_message) {
+  LOG(ERROR) << "Shill Error calling ConnectToBestServices: "
+             << error_name << " : " << error_message;
+}
+
+}  // namespace
+
 NetworkLoginObserver::NetworkLoginObserver() {
+  if (CrosLibrary::Get()->GetCertLibrary()->CertificatesLoaded())
+    OnCertificatesLoaded(true);
+  else
+    CrosLibrary::Get()->GetCertLibrary()->AddObserver(this);
 }
 
 NetworkLoginObserver::~NetworkLoginObserver() {
+  CrosLibrary::Get()->GetCertLibrary()->RemoveObserver(this);
 }
 
 void NetworkLoginObserver::OnNetworkManagerChanged(NetworkLibrary* cros) {
   // Check to see if we have any newly failed wifi network.
   const WifiNetworkVector& wifi_networks = cros->wifi_networks();
   for (WifiNetworkVector::const_iterator it = wifi_networks.begin();
        it != wifi_networks.end(); it++) {
     WifiNetwork* wifi = *it;
     if (wifi->notify_failure()) {
       // Display login dialog again for bad_passphrase and bad_wepkey errors.
@@ skipping 45 matching lines @@
               << ", added: " << vpn->added();
       // Display login dialog for any error or newly added network.
       if (vpn->error() != ERROR_NO_ERROR || vpn->added()) {
         NetworkConfigView::Show(vpn, NULL);
         return;  // Only support one failure per notification.
       }
     }
   }
 }
 
+void NetworkLoginObserver::OnCertificatesLoaded(bool initial_load) {
+  // Once certificates have loaded, signal Shill connect to the "best"
+  // available network.
+  DBusThreadManager::Get()->GetShillManagerClient()->ConnectToBestServices(
+      base::Bind(&base::DoNothing), base::Bind(&ShillErrorCallback));
+}
+
 }  // namespace chromeos