Remove usage of singleton software_slot_ in nss on ChromeOS

net/base/keygen_handler_unittest.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 "net/base/keygen_handler.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 12 matching lines @@
 
 namespace net {
 
 namespace {
 
 class KeygenHandlerTest : public ::testing::Test {
  public:
   KeygenHandlerTest() {}
   virtual ~KeygenHandlerTest() {}
 
-  virtual void SetUp() {
+ private:
 #if defined(OS_CHROMEOS) && defined(USE_NSS)
-    crypto::OpenPersistentNSSDB();
+  crypto::ScopedTestNSSDB test_nss_db_;

[pneubeck (no reviews), 2014/06/12 15:14:54]

will the complicated setup in these browser tests (e.g.
chrome/browser/ui/webui/options/certificate_manager_browsertest.cc) be simpler
now?

(just want to now, can be done in a follow up)

[tbarzic, 2014/06/12 18:38:12]

yes, I originally had that here, but decided to split it out to  a follow up cl:
https://codereview.chromium.org/325313004/

 #endif
-  }
 };
 
 // Assert that |result| is a valid output for KeygenHandler given challenge
 // string of |challenge|.
 void AssertValidSignedPublicKeyAndChallenge(const std::string& result,
                                             const std::string& challenge) {
   ASSERT_GT(result.length(), 0U);
 
   // Verify it's valid base64:
   std::string spkac;
@@ skipping 77 matching lines @@
     events[i] = NULL;
 
     VLOG(1) << "KeygenHandler " << i << " produced: " << results[i];
     AssertValidSignedPublicKeyAndChallenge(results[i], "some challenge");
   }
 }
 
 }  // namespace
 
 }  // namespace net