Reland "Remove chromeos::LibraryLoader"

chrome/browser/chromeos/cros/cert_library.cc

Index: chrome/browser/chromeos/cros/cert_library.cc
diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc
index a5cade12441dbe0a919cd72e5a141f74999d2197..4ab9810dd255041974a473e759acd28f101172bf 100644
--- a/chrome/browser/chromeos/cros/cert_library.cc
+++ b/chrome/browser/chromeos/cros/cert_library.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -153,8 +154,7 @@ class CertLibraryImpl
     // 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();
@@ -527,7 +527,9 @@ 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();
 }