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..82d32d34d5f4a75948c548db947dfa965863f919 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,16 @@
 namespace chromeos {
 
 NetworkLoginObserver::NetworkLoginObserver() {
-  CrosLibrary::Get()->GetCertLibrary()->AddObserver(this);
+  // CertLibrary 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 (CertLibrary::IsInitialized())

[pneubeck (no reviews), 2013/05/03 09:42:54]

You could use CertLoader already. I know that it's gonna be removed, but it's a
small change and it separates CertLibrary even more clearly.

[stevenjb, 2013/05/03 17:02:32]

Done.

+    CertLibrary::Get()->AddObserver(this);
 }
 
 NetworkLoginObserver::~NetworkLoginObserver() {
-  CrosLibrary::Get()->GetCertLibrary()->RemoveObserver(this);
+  if (CertLibrary::IsInitialized())
+    CertLibrary::Get()->RemoveObserver(this);
 }
 
 void NetworkLoginObserver::OnNetworkManagerChanged(NetworkLibrary* cros) {