Separate cert loading code from CertLibrary and move to src/chromeos

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/network/network_state_handler.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace chromeos {
 
 NetworkLoginObserver::NetworkLoginObserver() {
-  CrosLibrary::Get()->GetCertLibrary()->AddObserver(this);
+  // CertLoader does not get initialized in many unit tests even though
+  // NetworkLibrary which owns this class does. TODO(stevenjb): Eliminate
+  // this class along with NetworkLibrary, crbug.com/154852.
+  if (CertLoader::IsInitialized())
+    CertLoader::Get()->AddObserver(this);
 }
 
 NetworkLoginObserver::~NetworkLoginObserver() {
-  CrosLibrary::Get()->GetCertLibrary()->RemoveObserver(this);
+  if (CertLoader::IsInitialized())
+    CertLoader::Get()->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) {
+void NetworkLoginObserver::OnCertificatesLoaded(
+    const net::CertificateList& cert_list,
+    bool initial_load) {
   if (initial_load) {
     // Once certificates have loaded, connect to the "best" available network.
     NetworkStateHandler::Get()->ConnectToBestWifiNetwork();
   }
 }
 
 }  // namespace chromeos