[login_manager] Fix race condition that caused ownership to never work

mock_nss_util.h

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef LOGIN_MANAGER_MOCK_NSS_UTIL_H_
 #define LOGIN_MANAGER_MOCK_NSS_UTIL_H_
 
 #include "login_manager/nss_util.h"
 
 #include <unistd.h>
 #include <base/file_path.h>
 #include <base/nss_util.h>
 #include <gmock/gmock.h>
 
 namespace base {
 class RSAPrivateKey;
 }
 
 namespace login_manager {
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::_;
 
 class MockNssUtil : public NssUtil {
  public:
   MockNssUtil() {}
   virtual ~MockNssUtil() {}
 
+  MOCK_METHOD0(MightHaveKeys, bool());
   MOCK_METHOD0(OpenUserDB, bool());
   MOCK_METHOD1(GetPrivateKey, base::RSAPrivateKey*(const std::vector<uint8>&));
   MOCK_METHOD0(GenerateKeyPair, base::RSAPrivateKey*());
   MOCK_METHOD0(GetOwnerKeyFilePath, FilePath());
   MOCK_METHOD8(Verify, bool(const uint8* algorithm, int algorithm_len,
                             const uint8* signature, int signature_len,
                             const uint8* data, int data_len,
                             const uint8* public_key, int public_key_len));
   MOCK_METHOD4(Sign, bool(const uint8* data, int data_len,
                           std::vector<uint8>* OUT_signature,
                           base::RSAPrivateKey* key));
  protected:
   void ExpectGetOwnerKeyFilePath() {
-    EXPECT_CALL(*this, GetOwnerKeyFilePath())
-        .WillOnce(Return(FilePath("")));
+    EXPECT_CALL(*this, GetOwnerKeyFilePath()).WillOnce(Return(FilePath("")));
   }
 };
 
 template<typename T>
 class MockFactory : public NssUtil::Factory {
  public:
   MockFactory() {}
   ~MockFactory() {}
   NssUtil* CreateNssUtil() {
     return new T;
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(MockFactory);
 };
 
 class KeyCheckUtil : public MockNssUtil {
  public:
   KeyCheckUtil() {
     ExpectGetOwnerKeyFilePath();
-    EXPECT_CALL(*this, OpenUserDB())
-        .WillOnce(Return(true));
+    EXPECT_CALL(*this, MightHaveKeys()).WillOnce(Return(true));
+    EXPECT_CALL(*this, OpenUserDB()).WillOnce(Return(true));
     EXPECT_CALL(*this, GetPrivateKey(_))
         .WillOnce(Return(reinterpret_cast<base::RSAPrivateKey*>(7)));
   }
   virtual ~KeyCheckUtil() {}
 };
 
 class KeyFailUtil : public MockNssUtil {
  public:
   KeyFailUtil() {
     ExpectGetOwnerKeyFilePath();
-    EXPECT_CALL(*this, OpenUserDB())
-        .WillOnce(Return(true));
+    EXPECT_CALL(*this, MightHaveKeys()).WillOnce(Return(true));
+    EXPECT_CALL(*this, OpenUserDB()).WillOnce(Return(true));
     EXPECT_CALL(*this, GetPrivateKey(_))
         .WillOnce(Return(reinterpret_cast<base::RSAPrivateKey*>(NULL)));
   }
   virtual ~KeyFailUtil() {}
 };
 
 class SadNssUtil : public MockNssUtil {
  public:
   SadNssUtil() {
     ExpectGetOwnerKeyFilePath();
-    EXPECT_CALL(*this, OpenUserDB())
-        .WillOnce(Return(false));
+    EXPECT_CALL(*this, MightHaveKeys()).WillOnce(Return(true));
+    EXPECT_CALL(*this, OpenUserDB()).WillOnce(Return(false));
   }
   virtual ~SadNssUtil() {}
 };
 
+class EmptyNssUtil : public MockNssUtil {
+ public:
+  EmptyNssUtil() {
+    ExpectGetOwnerKeyFilePath();
+    EXPECT_CALL(*this, MightHaveKeys()).WillOnce(Return(false));
+  }
+  virtual ~EmptyNssUtil() {}
+};
+
 class ShortKeyGenerator : public MockNssUtil {
  public:
   ShortKeyGenerator() {
     base::EnsureNSSInit();
     base::OpenPersistentNSSDB();
-    ON_CALL(*this, GenerateKeyPair())
-        .WillByDefault(Invoke(CreateFake));
+    ON_CALL(*this, GenerateKeyPair()).WillByDefault(Invoke(CreateFake));
   }
   virtual ~ShortKeyGenerator() {}
 
   static base::RSAPrivateKey* CreateFake() {
     base::RSAPrivateKey* ret = base::RSAPrivateKey::CreateSensitive(512);
     LOG_IF(INFO, ret == NULL) << "returning NULL!!!";
     return ret;
   }
 };
 
 class ShortKeyUtil : public ShortKeyGenerator {
  public:
   ShortKeyUtil() {
     ExpectGetOwnerKeyFilePath();
-    EXPECT_CALL(*this, OpenUserDB())
-        .WillOnce(Return(true));
-    EXPECT_CALL(*this, GenerateKeyPair())
-        .Times(1);
+    EXPECT_CALL(*this, MightHaveKeys()).WillOnce(Return(true));
+    EXPECT_CALL(*this, OpenUserDB()).WillOnce(Return(true));
+    EXPECT_CALL(*this, GenerateKeyPair()).Times(1);
   }
   virtual ~ShortKeyUtil() {}
 };
 
 }  // namespace login_manager
 
 #endif  // LOGIN_MANAGER_MOCK_NSS_UTIL_H_