Reland "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/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"  // g_browser_process
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 127 matching lines @@
     // Ensure we've opened the real user's key/certificate database.
     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)) {

[hashimoto, 2012/06/21 15:37:20]

Steven, loading Opencryptoki on Linux resulted in build bot failure.
(http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%2...)
Can we remove this stub hack at all?
It looks like no one uses this code path on Linux recently.

[stevenjb, 2012/06/21 16:29:54]

I'm not sure why we were loading this for --stub-cros, removing it seems fine.
Otherwise we would need to protect it with IsRunningOnChromeOS().

+            switches::kLoadOpencryptoki)) {
       crypto::EnableTPMTokenForNSS();
       // Note: this calls crypto::EnsureTPMTokenReady()
       RequestCertificates();
     }
     key_store_loaded_ = true;
   }
 
   virtual bool CertificatesLoading() const OVERRIDE {
     return certificates_requested_ && !certificates_loaded_;
   }
@@ skipping 352 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CertLibraryImpl);
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 CertLibrary::~CertLibrary() {
 }
 
 // static
 CertLibrary* CertLibrary::GetImpl(bool stub) {
-  // No libcros dependencies, so always return CertLibraryImpl() (no stub).
+  // |stub| is ignored since we have no stub of CertLibrary.
+  // TODO(stevenjb): Disassociate CertLibrary from CrosLibrary entirely.
+  // crbug.com/133752
   return new CertLibraryImpl();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 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 41 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