This change loads opencryptoki and uses the TPM for keygen tags.

chrome/common/chrome_switches.cc

 // Copyright (c) 2011 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/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 
 namespace switches {
 
@@ skipping 687 matching lines @@
 
 // Specifies the flags passed to JS engine
 const char kJavaScriptFlags[]               = "js-flags";
 
 // Used for testing - keeps browser alive after last browser window closes.
 const char kKeepAliveForTest[]              = "keep-alive-for-test";
 
 // Load an extension from the specified directory.
 const char kLoadExtension[]                 = "load-extension";
 
+// Load the opencryptoki library into NSS at startup.  This is only
+// needed temporarily for developers who need to work on WiFi/VPN
+// certificate code.
+// TODO(gspencer): Remove this switch once cryptohomed work is finished:
+// http://crosbug.com/12295 and http://crosbug.com/12304
+const char kLoadOpencryptoki[]              = "load-opencryptoki";
+
 // Uninstall an extension with the specified extension id.
 const char kUninstallExtension[]            = "uninstall-extension";
 
 // Make Chrome default browser
 const char kMakeDefaultBrowser[]            = "make-default-browser";
 
 // Forces the maximum disk space to be used by the media cache, in bytes.
 const char kMediaCacheSize[]                = "media-cache-size";
 
 // Enable dynamic loading of the Memory Profiler DLL, which will trace
@@ skipping 499 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead,
 // please put them in alphabetical order above, or in order inside the
 // appropriate ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches