Add NetworkHandler to own network handlers in src/chromeos/network

chromeos/network/cert_loader.cc

 // Copyright (c) 2013 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 "chromeos/network/cert_loader.h"
 
 #include <algorithm>
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/observer_list.h"
@@ skipping 30 matching lines @@
   return next_delay;
 }
 
 void LoadNSSCertificates(net::CertificateList* cert_list) {
   if (base::chromeos::IsRunningOnChromeOS())
     net::NSSCertDatabase::GetInstance()->ListCerts(cert_list);
 }
 
 }  // namespace
 
-static CertLoader* g_cert_loader = NULL;
-
-// static
-void CertLoader::Initialize() {
-  CHECK(!g_cert_loader);
-  g_cert_loader = new CertLoader();
-}
-
-// static
-void CertLoader::Shutdown() {
-  CHECK(g_cert_loader);
-  delete g_cert_loader;
-  g_cert_loader = NULL;
-}
-
-// static
-CertLoader* CertLoader::Get() {
-  CHECK(g_cert_loader) << "CertLoader::Get() called before Initialize()";
-  return g_cert_loader;
-}
-
-// static
-bool CertLoader::IsInitialized() {
-  return g_cert_loader;
-}
-
 CertLoader::CertLoader()
     : certificates_requested_(false),
       certificates_loaded_(false),
       certificates_update_required_(false),
       certificates_update_running_(false),
       tpm_token_state_(TPM_STATE_UNKNOWN),
       tpm_request_delay_(
           base::TimeDelta::FromMilliseconds(kInitialRequestDelayMs)),
       initialize_token_factory_(this),
       update_certificates_factory_(this) {
   net::CertDatabase::GetInstance()->AddObserver(this);
-  LoginState::Get()->AddObserver(this);
+  if (LoginState::IsInitialized())
+    LoginState::Get()->AddObserver(this);
   RequestCertificates();
 }
 
 CertLoader::~CertLoader() {
   net::CertDatabase::GetInstance()->RemoveObserver(this);
-  LoginState::Get()->RemoveObserver(this);
+  if (LoginState::IsInitialized())
+    LoginState::Get()->RemoveObserver(this);
 }
 
 void CertLoader::AddObserver(CertLoader::Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void CertLoader::RemoveObserver(CertLoader::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 bool CertLoader::CertificatesLoading() const {
   return certificates_requested_ && !certificates_loaded_;
 }
 
 bool CertLoader::IsHardwareBacked() const {
   return !tpm_token_name_.empty();
 }
 
 void CertLoader::RequestCertificates() {
   CHECK(thread_checker_.CalledOnValidThread());
-  VLOG(1) << "RequestCertificates: " << LoginState::Get()->IsUserLoggedIn();
-  if (certificates_requested_ || !LoginState::Get()->IsUserLoggedIn())
+  const bool logged_in = LoginState::IsInitialized() ?
+      LoginState::Get()->IsUserLoggedIn() : false;
+  VLOG(1) << "RequestCertificates: " << logged_in;
+  if (certificates_requested_ || !logged_in)
     return;
 
   certificates_requested_ = true;
 
   // Ensure we've opened the user's key/certificate database.
   crypto::OpenPersistentNSSDB();
   if (base::chromeos::IsRunningOnChromeOS())
     crypto::EnableTPMTokenForNSS();
 
   // This is the entry point to the TPM token initialization process, which we
   // should do at most once.
   DCHECK(!initialize_token_factory_.HasWeakPtrs());
   InitializeTokenAndLoadCertificates();
 }
 
 void CertLoader::InitializeTokenAndLoadCertificates() {
   CHECK(thread_checker_.CalledOnValidThread());
   VLOG(1) << "InitializeTokenAndLoadCertificates";
 
-  switch(tpm_token_state_) {
+  switch (tpm_token_state_) {
     case TPM_STATE_UNKNOWN: {
       DBusThreadManager::Get()->GetCryptohomeClient()->TpmIsEnabled(
       base::Bind(&CertLoader::OnTpmIsEnabled,
                  initialize_token_factory_.GetWeakPtr()));
       return;
     }
     case TPM_DISABLED: {
       // TPM is disabled, so proceed with empty tpm token name.
       StartLoadCertificates();
       return;
@@ skipping 174 matching lines @@
   VLOG(1) << "OnCertRemoved";
   StartLoadCertificates();
 }
 
 void CertLoader::LoggedInStateChanged(LoginState::LoggedInState state) {
   VLOG(1) << "LoggedInStateChanged: " << state;
   RequestCertificates();
 }
 
 }  // namespace chromeos