Revert 178354

Broke Linux Chromium OS ASAN:
http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASAN%20Builder/builds/4509/steps/compile/logs/stdio

In file included from ../../chromeos/attestation/attestation_flow_unittest.cc:7:
../../chromeos/attestation/mock_attestation_flow.h:23:3:error: [chromium-style] Overriding method must have "virtual" keyword.
  void SendEnrollRequest(const std::string& request,
    ^
    ../../chromeos/attestation/mock_attestation_flow.h:24:56:error: [chromium-style] virtual methods with non-empty bodies shouldn't be declared inline.
                             const DataCallback& callback) {


> Implemented attestation message flow for Chrome OS.
>     
> Chrome OS has an attestation service which can interact with a Privacy CA in order to generate an attestation certificate.  The AttestationFlow class coordinates this interaction.
> 
> BUG=chromium-os:37806
> TEST=unit
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/11932004

TBR=dkrahn@google.com
Review URL: https://codereview.chromium.org/12042056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178358 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 42 deletions

diff --git a/chromeos/cryptohome/mock_async_method_caller.cc b/chromeos/cryptohome/mock_async_method_caller.cc
index ce02bd3..eb2203c 100644
--- a/chromeos/cryptohome/mock_async_method_caller.cc
+++ b/chromeos/cryptohome/mock_async_method_caller.cc
@@ -10,10 +10,6 @@ using ::testing::_;
 
 namespace cryptohome {
 
-const char MockAsyncMethodCaller::kFakeAttestationEnrollRequest[] = "enrollreq";
-const char MockAsyncMethodCaller::kFakeAttestationCertRequest[] = "certreq";
-const char MockAsyncMethodCaller::kFakeAttestationCert[] = "cert";
-
 MockAsyncMethodCaller::MockAsyncMethodCaller()
     : success_(false), return_code_(cryptohome::MOUNT_ERROR_NONE) {
 }
@@ -38,40 +34,10 @@ void MockAsyncMethodCaller::SetUp(bool success, MountError return_code) {
   ON_CALL(*this, AsyncRemove(_, _))
       .WillByDefault(
           WithArgs<1>(Invoke(this, &MockAsyncMethodCaller::DoCallback)));
-  ON_CALL(*this, AsyncTpmAttestationCreateEnrollRequest(_))
-      .WillByDefault(
-          WithArgs<0>(Invoke(this,
-                             &MockAsyncMethodCaller::FakeCreateEnrollRequest)));
-  ON_CALL(*this, AsyncTpmAttestationEnroll(_, _))
-      .WillByDefault(
-          WithArgs<1>(Invoke(this, &MockAsyncMethodCaller::DoCallback)));
-  ON_CALL(*this, AsyncTpmAttestationCreateCertRequest(_, _))
-      .WillByDefault(
-          WithArgs<1>(Invoke(this,
-                             &MockAsyncMethodCaller::FakeCreateCertRequest)));
-  ON_CALL(*this, AsyncTpmAttestationFinishCertRequest(_, _))
-      .WillByDefault(
-          WithArgs<1>(Invoke(this,
-                             &MockAsyncMethodCaller::FakeFinishCertRequest)));
 }
 
 void MockAsyncMethodCaller::DoCallback(Callback callback) {
   callback.Run(success_, return_code_);
 }
 
-void MockAsyncMethodCaller::FakeCreateEnrollRequest(
-    const DataCallback& callback) {
-  callback.Run(success_, kFakeAttestationEnrollRequest);
-}
-
-void MockAsyncMethodCaller::FakeCreateCertRequest(
-    const DataCallback& callback) {
-  callback.Run(success_, kFakeAttestationCertRequest);
-}
-
-void MockAsyncMethodCaller::FakeFinishCertRequest(
-    const DataCallback& callback) {
-  callback.Run(success_, kFakeAttestationCert);
-}
-
 }  // namespace cryptohome
diff --git a/chromeos/cryptohome/mock_async_method_caller.h b/chromeos/cryptohome/mock_async_method_caller.h
index 2e8d352..37bc0c44 100644
--- a/chromeos/cryptohome/mock_async_method_caller.h
+++ b/chromeos/cryptohome/mock_async_method_caller.h
@@ -16,10 +16,6 @@ namespace cryptohome {
 
 class MockAsyncMethodCaller : public AsyncMethodCaller {
  public:
-  static const char kFakeAttestationEnrollRequest[];
-  static const char kFakeAttestationCertRequest[];
-  static const char kFakeAttestationCert[];
-
   MockAsyncMethodCaller();
   virtual ~MockAsyncMethodCaller();
 
@@ -54,10 +50,6 @@ class MockAsyncMethodCaller : public AsyncMethodCaller {
   MountError return_code_;
 
   void DoCallback(Callback callback);
-  // Default fakes for attestation calls.
-  void FakeCreateEnrollRequest(const DataCallback& callback);
-  void FakeCreateCertRequest(const DataCallback& callback);
-  void FakeFinishCertRequest(const DataCallback& callback);
 
   DISALLOW_COPY_AND_ASSIGN(MockAsyncMethodCaller);
 };