chromeos: Remove CryptohomeLibrary::TpmGetPassword and TpmIsReady

chrome/browser/chromeos/cros/cryptohome_library.cc

 // Copyright (c) 2012 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/browser/chromeos/cros/cryptohome_library.h"
 
 #include <map>
 
 #include "base/memory/weak_ptr.h"
 #include "base/string_number_conversions.h"
@@ skipping 17 matching lines @@
 
   virtual ~CryptohomeLibraryImpl() {
   }
 
   virtual bool IsMounted() OVERRIDE {
     bool result = false;
     DBusThreadManager::Get()->GetCryptohomeClient()->IsMounted(&result);
     return result;
   }
 
-  virtual bool TpmIsReady() OVERRIDE {
-    bool result = false;
-    DBusThreadManager::Get()->GetCryptohomeClient()->TpmIsReady(&result);
-    return result;
-  }
-
   virtual bool TpmIsEnabled() OVERRIDE {
     bool result = false;
     DBusThreadManager::Get()->GetCryptohomeClient()->CallTpmIsEnabledAndBlock(
         &result);
     return result;
   }
 
   virtual bool TpmIsOwned() OVERRIDE {
     bool result = false;
     DBusThreadManager::Get()->GetCryptohomeClient()->TpmIsOwned(&result);
     return result;
   }
 
   virtual bool TpmIsBeingOwned() OVERRIDE {
     bool result = false;
     DBusThreadManager::Get()->GetCryptohomeClient()->TpmIsBeingOwned(&result);
     return result;
   }
 
-  virtual bool TpmGetPassword(std::string* password) OVERRIDE {
-    return DBusThreadManager::Get()->GetCryptohomeClient()->
-        TpmGetPassword(password);
-  }
-
   virtual void TpmCanAttemptOwnership() OVERRIDE {
     DBusThreadManager::Get()->GetCryptohomeClient()->TpmCanAttemptOwnership();
   }
 
   virtual void TpmClearStoredPassword() OVERRIDE {
     DBusThreadManager::Get()->GetCryptohomeClient()->TpmClearStoredPassword();
   }
 
   virtual bool InstallAttributesGet(
       const std::string& name, std::string* value) OVERRIDE {
@@ skipping 73 matching lines @@
 class CryptohomeLibraryStubImpl : public CryptohomeLibrary {
  public:
   CryptohomeLibraryStubImpl()
     : locked_(false) {}
   virtual ~CryptohomeLibraryStubImpl() {}
 
   virtual bool IsMounted() OVERRIDE {
     return true;
   }
 
-  // Tpm begin ready after 20-th call.
-  virtual bool TpmIsReady() OVERRIDE {
-    static int counter = 0;
-    return ++counter > 20;
-  }
-
   virtual bool TpmIsEnabled() OVERRIDE {
     return true;
   }
 
   virtual bool TpmIsOwned() OVERRIDE {
     return true;
   }
 
   virtual bool TpmIsBeingOwned() OVERRIDE {
     return true;
   }
 
-  virtual bool TpmGetPassword(std::string* password) OVERRIDE {
-    *password = "Stub-TPM-password";
-    return true;
-  }
-
   virtual void TpmCanAttemptOwnership() OVERRIDE {}
 
   virtual void TpmClearStoredPassword() OVERRIDE {}
 
   virtual bool InstallAttributesGet(
       const std::string& name, std::string* value) OVERRIDE {
     if (install_attrs_.find(name) != install_attrs_.end()) {
       *value = install_attrs_[name];
       return true;
     }
@@ skipping 40 matching lines @@
 CryptohomeLibrary* CryptohomeLibrary::GetImpl(bool stub) {
   CryptohomeLibrary* impl;
   if (stub)
     impl = new CryptohomeLibraryStubImpl();
   else
     impl = new CryptohomeLibraryImpl();
   return impl;
 }
 
 } // namespace chromeos