diff options
| author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-20 01:34:24 +0000 |
|---|---|---|
| committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-20 01:34:24 +0000 |
| commit | 3be2f5d5bf937d099ecd7dffec87466124a77a2e (patch) | |
| tree | 99b1e5dd2d1f890f48a558891b8d115c1bc163e6 /ppapi/cpp/private | |
| parent | 564719c7b7a8b5b1780d220ccaa02f9d7102a1e5 (diff) | |
| download | chromium_src-3be2f5d5bf937d099ecd7dffec87466124a77a2e.zip chromium_src-3be2f5d5bf937d099ecd7dffec87466124a77a2e.tar.gz chromium_src-3be2f5d5bf937d099ecd7dffec87466124a77a2e.tar.bz2 | |
Remove CanChallengePlatform() and CheckPlatformState().
This API did not meet its intended purpose. We've decided to instead
just use a real challenge and wait for the response.
BUG=307707,309158
TEST=compile, unittests pass.
TBR=pastarmovj
Review URL: https://codereview.chromium.org/29943003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp/private')
| -rw-r--r-- | ppapi/cpp/private/platform_verification.cc | 19 | ||||
| -rw-r--r-- | ppapi/cpp/private/platform_verification.h | 2 |
2 files changed, 5 insertions, 16 deletions
diff --git a/ppapi/cpp/private/platform_verification.cc b/ppapi/cpp/private/platform_verification.cc index f908570..e199a71 100644 --- a/ppapi/cpp/private/platform_verification.cc +++ b/ppapi/cpp/private/platform_verification.cc @@ -15,16 +15,16 @@ namespace pp { namespace { -template <> const char* interface_name<PPB_PlatformVerification_Private_0_1>() { - return PPB_PLATFORMVERIFICATION_PRIVATE_INTERFACE_0_1; +template <> const char* interface_name<PPB_PlatformVerification_Private_0_2>() { + return PPB_PLATFORMVERIFICATION_PRIVATE_INTERFACE_0_2; } inline bool HasInterface() { - return has_interface<PPB_PlatformVerification_Private_0_1>(); + return has_interface<PPB_PlatformVerification_Private_0_2>(); } -inline const PPB_PlatformVerification_Private_0_1* GetInterface() { - return get_interface<PPB_PlatformVerification_Private_0_1>(); +inline const PPB_PlatformVerification_Private_0_2* GetInterface() { + return get_interface<PPB_PlatformVerification_Private_0_2>(); } } // namespace @@ -36,15 +36,6 @@ PlatformVerification::PlatformVerification(const InstanceHandle& instance) { PlatformVerification::~PlatformVerification() {} -int32_t PlatformVerification::CanChallengePlatform( - const CompletionCallbackWithOutput<bool>& callback) { - if (!HasInterface()) - return callback.MayForce(PP_ERROR_NOINTERFACE); - - return GetInterface()->CanChallengePlatform( - pp_resource(), callback.output(), callback.pp_completion_callback()); -} - int32_t PlatformVerification::ChallengePlatform( const Var& service_id, const Var& challenge, diff --git a/ppapi/cpp/private/platform_verification.h b/ppapi/cpp/private/platform_verification.h index 7f0f8a1..166077a 100644 --- a/ppapi/cpp/private/platform_verification.h +++ b/ppapi/cpp/private/platform_verification.h @@ -18,8 +18,6 @@ class PlatformVerification : public Resource { explicit PlatformVerification(const InstanceHandle& instance); virtual ~PlatformVerification(); - int32_t CanChallengePlatform( - const CompletionCallbackWithOutput<bool>& callback); int32_t ChallengePlatform(const Var& service_id, const Var& challenge, Var* signed_data, |