Remove chromeos::LibraryLoader

chrome/browser/chromeos/cros/cert_library.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/cros/cert_library.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 90 matching lines @@
 
 // base::Unretained(this) in the class is safe. By the time this object is
 // deleted as part of CrosLibrary, the DB thread and the UI message loop
 // are already terminated.
 class CertLibraryImpl
     : public CertLibrary,
       public net::CertDatabase::Observer {
  public:
   typedef ObserverListThreadSafe<CertLibrary::Observer> CertLibraryObserverList;
 
-  CertLibraryImpl() :
+  explicit CertLibraryImpl(bool stub) :
       observer_list_(new CertLibraryObserverList),
       tpm_token_ready_(false),
       user_logged_in_(false),
       certificates_requested_(false),
       certificates_loaded_(false),
       key_store_loaded_(false),
+      is_stub_mode_(stub),
       ALLOW_THIS_IN_INITIALIZER_LIST(certs_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(user_certs_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(server_certs_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(server_ca_certs_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     net::CertDatabase::AddObserver(this);
   }
 
   ~CertLibraryImpl() {
@@ skipping 19 matching lines @@
     crypto::OpenPersistentNSSDB();
 
     // Only load the Opencryptoki library into NSS if we have this switch.
     // TODO(gspencer): Remove this switch once cryptohomed work is finished:
     // http://crosbug.com/12295 and 12304
     // Note: ChromeOS login with or without loginmanager will crash when
     // the CertLibrary is not there (http://crosbug.com/121456). Before removing
     // make sure that that case still works.
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kLoadOpencryptoki) ||
-        CommandLine::ForCurrentProcess()->HasSwitch(switches::kStubCros)) {
+        is_stub_mode_) {

[stevenjb, 2012/06/20 17:26:47]

This really shouldn't be tied to stub_mode, it should be tied directly to
!IsRunningOnChromeOS(). Let's just ignore the stub argument in the constructor
for now, and create a TODO + issue to disassociate CertLibrary from CrosLibrary
entirely; I never should have associated the two in the first place.

Created issue: crbug.com/133752

[hashimoto, 2012/06/21 06:20:59]

Done.

       crypto::EnableTPMTokenForNSS();
       // Note: this calls crypto::EnsureTPMTokenReady()
       RequestCertificates();
     }
     key_store_loaded_ = true;
   }
 
   virtual bool CertificatesLoading() const OVERRIDE {
     return certificates_requested_ && !certificates_loaded_;
   }
@@ skipping 334 matching lines @@
 
   // Local state.
   bool user_logged_in_;
   bool certificates_requested_;
   bool certificates_loaded_;
   // The key store for the current user has been loaded. This flag is needed to
   // ensure that the key store will not be loaded twice in the policy recovery
   // "safe-mode".
   bool key_store_loaded_;
 
+  // True when stub implementation is required.
+  bool is_stub_mode_;
+
   // Certificates.
   CertList certs_;
   CertList user_certs_;
   CertList server_certs_;
   CertList server_ca_certs_;
 
   base::WeakPtrFactory<CertLibraryImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CertLibraryImpl);
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 CertLibrary::~CertLibrary() {
 }
 
 // static
 CertLibrary* CertLibrary::GetImpl(bool stub) {
-  // No libcros dependencies, so always return CertLibraryImpl() (no stub).
-  return new CertLibraryImpl();
+  return new CertLibraryImpl(stub);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 net::X509Certificate* CertLibrary::CertList::GetCertificateAt(int index) const {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_GE(index, 0);
   DCHECK_LT(index, static_cast<int>(list_.size()));
   return list_[index].get();
 }
@@ skipping 40 matching lines @@
     net::X509Certificate* cert = GetCertificateAt(index);
     net::X509Certificate::OSCertHandle cert_handle = cert->os_cert_handle();
     std::string id = x509_certificate_model::GetPkcs11Id(cert_handle);
     if (id == pkcs11_id)
       return index;
   }
   return -1;  // Not found.
 }
 
 }  // chromeos