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

chrome/browser/chromeos/network_login_observer.cc

Index: chrome/browser/chromeos/network_login_observer.cc
diff --git a/chrome/browser/chromeos/network_login_observer.cc b/chrome/browser/chromeos/network_login_observer.cc
index 3511865dcd630370482fc32f53513e353ec57655..7f5de83b279c09c1745cc1625b4165cec0d45c58 100644
--- a/chrome/browser/chromeos/network_login_observer.cc
+++ b/chrome/browser/chromeos/network_login_observer.cc
@@ -4,7 +4,7 @@
 
 #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"
@@ -14,11 +14,13 @@
 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) {