| Index: extensions/browser/api/test/test_api.h
|
| diff --git a/extensions/browser/api/test/test_api.h b/extensions/browser/api/test/test_api.h
|
| index f86fea842730ae043e4d4a1f084500449441ce75..3fc88cd0576ea9dcc62fb4812010ba758613c3d5 100644
|
| --- a/extensions/browser/api/test/test_api.h
|
| +++ b/extensions/browser/api/test/test_api.h
|
| @@ -20,14 +20,12 @@ namespace extensions {
|
|
|
| // A function that is only available in tests.
|
| // Prior to running, checks that we are in a testing process.
|
| -class TestExtensionFunction : public SyncExtensionFunction {
|
| +class TestExtensionFunction : public UIThreadExtensionFunction {
|
| protected:
|
| ~TestExtensionFunction() override;
|
|
|
| - // SyncExtensionFunction:
|
| - bool RunSync() override;
|
| -
|
| - virtual bool RunSafe() = 0;
|
| + // ExtensionFunction:
|
| + bool PreRunValidation(std::string* error) override;
|
| };
|
|
|
| class TestNotifyPassFunction : public TestExtensionFunction {
|
| @@ -37,8 +35,8 @@ class TestNotifyPassFunction : public TestExtensionFunction {
|
| protected:
|
| ~TestNotifyPassFunction() override;
|
|
|
| - // TestExtensionFunction:
|
| - bool RunSafe() override;
|
| + // ExtensionFunction:
|
| + ResponseAction Run() override;
|
| };
|
|
|
| class TestNotifyFailFunction : public TestExtensionFunction {
|
| @@ -48,8 +46,8 @@ class TestNotifyFailFunction : public TestExtensionFunction {
|
| protected:
|
| ~TestNotifyFailFunction() override;
|
|
|
| - // TestExtensionFunction:
|
| - bool RunSafe() override;
|
| + // ExtensionFunction:
|
| + ResponseAction Run() override;
|
| };
|
|
|
| class TestLogFunction : public TestExtensionFunction {
|
| @@ -59,8 +57,8 @@ class TestLogFunction : public TestExtensionFunction {
|
| protected:
|
| ~TestLogFunction() override;
|
|
|
| - // TestExtensionFunction:
|
| - bool RunSafe() override;
|
| + // ExtensionFunction:
|
| + ResponseAction Run() override;
|
| };
|
|
|
| class TestSendMessageFunction : public UIThreadExtensionFunction {
|
| @@ -121,8 +119,8 @@ class TestGetConfigFunction : public TestExtensionFunction {
|
|
|
| ~TestGetConfigFunction() override;
|
|
|
| - // TestExtensionFunction:
|
| - bool RunSafe() override;
|
| + // ExtensionFunction:
|
| + ResponseAction Run() override;
|
| };
|
|
|
| class TestWaitForRoundTripFunction : public TestExtensionFunction {
|
| @@ -132,8 +130,8 @@ class TestWaitForRoundTripFunction : public TestExtensionFunction {
|
| protected:
|
| ~TestWaitForRoundTripFunction() override;
|
|
|
| - // TestExtensionFunction:
|
| - bool RunSafe() override;
|
| + // ExtensionFunction:
|
| + ResponseAction Run() override;
|
| };
|
|
|
| } // namespace extensions
|
|
|