summaryrefslogtreecommitdiffstats
path: root/chromeos/cryptohome/mock_async_method_caller.h
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-23 20:02:55 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-23 20:02:55 +0000
commit3fd9722d3be919596658747fd26335879d64d55d (patch)
treea71859786563a075df584594c08efd6858893303 /chromeos/cryptohome/mock_async_method_caller.h
parent07198b07ec01a89c530010fdde2484ffa3560546 (diff)
downloadchromium_src-3fd9722d3be919596658747fd26335879d64d55d.zip
chromium_src-3fd9722d3be919596658747fd26335879d64d55d.tar.gz
chromium_src-3fd9722d3be919596658747fd26335879d64d55d.tar.bz2
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
Diffstat (limited to 'chromeos/cryptohome/mock_async_method_caller.h')
-rw-r--r--chromeos/cryptohome/mock_async_method_caller.h8
1 files changed, 0 insertions, 8 deletions
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);
};