| Index: net/base/keygen_handler_unittest.cc
|
| diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc
|
| index af4e01d99440e03f3f3b3c7e00e6374a9b2c16d6..cd9dde35e6e83d539d7d096a95f6fa488d214fac 100644
|
| --- a/net/base/keygen_handler_unittest.cc
|
| +++ b/net/base/keygen_handler_unittest.cc
|
| @@ -28,22 +28,22 @@ namespace {
|
|
|
| #if defined(USE_NSS)
|
| class StubCryptoModuleDelegate : public crypto::NSSCryptoModuleDelegate {
|
| - public:
|
| - explicit StubCryptoModuleDelegate(crypto::ScopedPK11Slot slot)
|
| - : slot_(slot.Pass()) {}
|
| -
|
| - virtual std::string RequestPassword(const std::string& slot_name,
|
| - bool retry,
|
| - bool* cancelled) override{
|
| - return std::string();
|
| - }
|
| -
|
| - virtual crypto::ScopedPK11Slot RequestSlot() override {
|
| - return crypto::ScopedPK11Slot(PK11_ReferenceSlot(slot_.get()));
|
| - }
|
| -
|
| - private:
|
| - crypto::ScopedPK11Slot slot_;
|
| + public:
|
| + explicit StubCryptoModuleDelegate(crypto::ScopedPK11Slot slot)
|
| + : slot_(slot.Pass()) {}
|
| +
|
| + virtual std::string RequestPassword(const std::string& slot_name,
|
| + bool retry,
|
| + bool* cancelled) override {
|
| + return std::string();
|
| + }
|
| +
|
| + virtual crypto::ScopedPK11Slot RequestSlot() override {
|
| + return crypto::ScopedPK11Slot(PK11_ReferenceSlot(slot_.get()));
|
| + }
|
| +
|
| + private:
|
| + crypto::ScopedPK11Slot slot_;
|
| };
|
| #endif
|
|
|
| @@ -140,7 +140,7 @@ void ConcurrencyTestCallback(const std::string& challenge,
|
| // test tries to catch concurrency problems in the keygen implementation.
|
| TEST_F(KeygenHandlerTest, ConcurrencyTest) {
|
| const int NUM_HANDLERS = 5;
|
| - base::WaitableEvent* events[NUM_HANDLERS] = { NULL };
|
| + base::WaitableEvent* events[NUM_HANDLERS] = {NULL};
|
| std::string results[NUM_HANDLERS];
|
| for (int i = 0; i < NUM_HANDLERS; i++) {
|
| scoped_ptr<KeygenHandler> handler(CreateKeygenHandler());
|
|
|