| Index: extensions/renderer/api_binding_unittest.cc
|
| diff --git a/extensions/renderer/api_binding_unittest.cc b/extensions/renderer/api_binding_unittest.cc
|
| index be0b7895550bb4919c86c00627a8f760c34cb544..20114a87adef2a88f3d7cfbe0a5a46fc97427f46 100644
|
| --- a/extensions/renderer/api_binding_unittest.cc
|
| +++ b/extensions/renderer/api_binding_unittest.cc
|
| @@ -16,6 +16,7 @@
|
| #include "extensions/renderer/api_invocation_errors.h"
|
| #include "extensions/renderer/api_request_handler.h"
|
| #include "extensions/renderer/api_type_reference_map.h"
|
| +#include "extensions/renderer/binding_access_checker.h"
|
| #include "gin/arguments.h"
|
| #include "gin/converter.h"
|
| #include "gin/public/context_holder.h"
|
| @@ -102,6 +103,7 @@ class APIBindingUnittest : public APIBindingTest {
|
|
|
| void TearDown() override {
|
| DisposeAllContexts();
|
| + access_checker_.reset();
|
| request_handler_.reset();
|
| event_handler_.reset();
|
| binding_.reset();
|
| @@ -149,7 +151,7 @@ class APIBindingUnittest : public APIBindingTest {
|
| }
|
|
|
| void SetAvailabilityCallback(
|
| - const APIBinding::AvailabilityCallback& callback) {
|
| + const BindingAccessChecker::AvailabilityCallback& callback) {
|
| availability_callback_ = callback;
|
| }
|
|
|
| @@ -166,11 +168,13 @@ class APIBindingUnittest : public APIBindingTest {
|
| base::Bind(&RunFunctionOnGlobalAndIgnoreResult),
|
| base::Bind(&RunFunctionOnGlobalAndReturnHandle),
|
| base::Bind(&OnEventListenersChanged));
|
| + access_checker_ =
|
| + base::MakeUnique<BindingAccessChecker>(availability_callback_);
|
| binding_ = base::MakeUnique<APIBinding>(
|
| kBindingName, binding_functions_.get(), binding_types_.get(),
|
| binding_events_.get(), binding_properties_.get(), create_custom_type_,
|
| - availability_callback_, std::move(binding_hooks_), &type_refs_,
|
| - request_handler_.get(), event_handler_.get());
|
| + std::move(binding_hooks_), &type_refs_, request_handler_.get(),
|
| + event_handler_.get(), access_checker_.get());
|
| EXPECT_EQ(!binding_types_.get(), type_refs_.empty());
|
| }
|
|
|
| @@ -229,6 +233,7 @@ class APIBindingUnittest : public APIBindingTest {
|
| std::unique_ptr<APIBinding> binding_;
|
| std::unique_ptr<APIEventHandler> event_handler_;
|
| std::unique_ptr<APIRequestHandler> request_handler_;
|
| + std::unique_ptr<BindingAccessChecker> access_checker_;
|
| APITypeReferenceMap type_refs_;
|
|
|
| std::unique_ptr<base::ListValue> binding_functions_;
|
| @@ -238,7 +243,7 @@ class APIBindingUnittest : public APIBindingTest {
|
| std::unique_ptr<APIBindingHooks> binding_hooks_;
|
| std::unique_ptr<APIBindingHooksDelegate> binding_hooks_delegate_;
|
| APIBinding::CreateCustomType create_custom_type_;
|
| - APIBinding::AvailabilityCallback availability_callback_;
|
| + BindingAccessChecker::AvailabilityCallback availability_callback_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(APIBindingUnittest);
|
| };
|
|
|