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/cert_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);
+  if (CertLibrary::IsInitialized())
+    CertLibrary::Get()->AddObserver(this);
 }
 
 NetworkLoginObserver::~NetworkLoginObserver() {
-  CrosLibrary::Get()->GetCertLibrary()->RemoveObserver(this);
+  if (CertLibrary::IsInitialized())

[Ryan Sleevi, 2013/05/01 18:16:18]

What happens if the CertLibrary is initialized after the NetworkLoginObserver?

Seems like you'd want to unconditionally register instead?

[stevenjb, 2013/05/01 20:47:59]

NetworkLoginObserver is owned by NetworkLibrary which gets instantiated for a
lot of unit tests in a kind of awkward way. CertLibrary only gets initialized by
unit tests that need it.

We're working on cleaning up these dependencies, and this class in particular
will be going away soon. I added a comment.

+    CertLibrary::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 53 matching lines @@
 }
 
 void NetworkLoginObserver::OnCertificatesLoaded(bool initial_load) {
   if (initial_load) {
     // Once certificates have loaded, connect to the "best" available network.
     NetworkStateHandler::Get()->ConnectToBestWifiNetwork();
   }
 }
 
 }  // namespace chromeos