[Cronet] Fix IDL generated files.
Somehow I forgot to update these in crrev.com/c/1383137.
Bug: 879208
Change-Id: I3edca33b133c3a0ed5fddaf057c2b11a7b40ed37
Reviewed-on: https://chromium-review.googlesource.com/c/1403494
Reviewed-by: Misha Efimov <mef@chromium.org>
Commit-Queue: Caleb Raitto <caraitto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621235}diff --git a/components/cronet/native/generated/cronet.idl_c.h b/components/cronet/native/generated/cronet.idl_c.h
index d927cde..ac45c1ac 100644
--- a/components/cronet/native/generated/cronet.idl_c.h
+++ b/components/cronet/native/generated/cronet.idl_c.h
@@ -644,35 +644,20 @@
// app. The following concrete methods forward call to app implementation. The
// app doesn't normally call them.
CRONET_EXPORT
-Cronet_RESULT Cronet_RequestFinishedInfoListener_InitWithParams(
- Cronet_RequestFinishedInfoListenerPtr self,
- Cronet_ExecutorPtr executor);
-CRONET_EXPORT
void Cronet_RequestFinishedInfoListener_OnRequestFinished(
Cronet_RequestFinishedInfoListenerPtr self,
Cronet_RequestFinishedInfoPtr request_info);
-CRONET_EXPORT
-Cronet_ExecutorPtr Cronet_RequestFinishedInfoListener_GetExecutor(
- Cronet_RequestFinishedInfoListenerPtr self);
// The app implements abstract interface Cronet_RequestFinishedInfoListener by
// defining custom functions for each method.
-typedef Cronet_RESULT (*Cronet_RequestFinishedInfoListener_InitWithParamsFunc)(
- Cronet_RequestFinishedInfoListenerPtr self,
- Cronet_ExecutorPtr executor);
typedef void (*Cronet_RequestFinishedInfoListener_OnRequestFinishedFunc)(
Cronet_RequestFinishedInfoListenerPtr self,
Cronet_RequestFinishedInfoPtr request_info);
-typedef Cronet_ExecutorPtr (
- *Cronet_RequestFinishedInfoListener_GetExecutorFunc)(
- Cronet_RequestFinishedInfoListenerPtr self);
// The app creates an instance of Cronet_RequestFinishedInfoListener by
// providing custom functions for each method.
CRONET_EXPORT Cronet_RequestFinishedInfoListenerPtr
Cronet_RequestFinishedInfoListener_CreateWith(
- Cronet_RequestFinishedInfoListener_InitWithParamsFunc InitWithParamsFunc,
Cronet_RequestFinishedInfoListener_OnRequestFinishedFunc
- OnRequestFinishedFunc,
- Cronet_RequestFinishedInfoListener_GetExecutorFunc GetExecutorFunc);
+ OnRequestFinishedFunc);
///////////////////////
// Struct Cronet_Error.
diff --git a/components/cronet/native/generated/cronet.idl_impl_interface.cc b/components/cronet/native/generated/cronet.idl_impl_interface.cc
index 2d8ccac..ecdea48 100644
--- a/components/cronet/native/generated/cronet.idl_impl_interface.cc
+++ b/components/cronet/native/generated/cronet.idl_impl_interface.cc
@@ -895,13 +895,6 @@
return self->client_context();
}
-Cronet_RESULT Cronet_RequestFinishedInfoListener_InitWithParams(
- Cronet_RequestFinishedInfoListenerPtr self,
- Cronet_ExecutorPtr executor) {
- DCHECK(self);
- return self->InitWithParams(executor);
-}
-
void Cronet_RequestFinishedInfoListener_OnRequestFinished(
Cronet_RequestFinishedInfoListenerPtr self,
Cronet_RequestFinishedInfoPtr request_info) {
@@ -909,55 +902,33 @@
self->OnRequestFinished(request_info);
}
-Cronet_ExecutorPtr Cronet_RequestFinishedInfoListener_GetExecutor(
- Cronet_RequestFinishedInfoListenerPtr self) {
- DCHECK(self);
- return self->GetExecutor();
-}
-
// Implementation of Cronet_RequestFinishedInfoListener that forwards calls to C
// functions implemented by the app.
class Cronet_RequestFinishedInfoListenerStub
: public Cronet_RequestFinishedInfoListener {
public:
- Cronet_RequestFinishedInfoListenerStub(
- Cronet_RequestFinishedInfoListener_InitWithParamsFunc InitWithParamsFunc,
+ explicit Cronet_RequestFinishedInfoListenerStub(
Cronet_RequestFinishedInfoListener_OnRequestFinishedFunc
- OnRequestFinishedFunc,
- Cronet_RequestFinishedInfoListener_GetExecutorFunc GetExecutorFunc)
- : InitWithParamsFunc_(InitWithParamsFunc),
- OnRequestFinishedFunc_(OnRequestFinishedFunc),
- GetExecutorFunc_(GetExecutorFunc) {}
+ OnRequestFinishedFunc)
+ : OnRequestFinishedFunc_(OnRequestFinishedFunc) {}
~Cronet_RequestFinishedInfoListenerStub() override {}
protected:
- Cronet_RESULT InitWithParams(Cronet_ExecutorPtr executor) override {
- return InitWithParamsFunc_(this, executor);
- }
-
void OnRequestFinished(Cronet_RequestFinishedInfoPtr request_info) override {
OnRequestFinishedFunc_(this, request_info);
}
- Cronet_ExecutorPtr GetExecutor() override { return GetExecutorFunc_(this); }
-
private:
- const Cronet_RequestFinishedInfoListener_InitWithParamsFunc
- InitWithParamsFunc_;
const Cronet_RequestFinishedInfoListener_OnRequestFinishedFunc
OnRequestFinishedFunc_;
- const Cronet_RequestFinishedInfoListener_GetExecutorFunc GetExecutorFunc_;
DISALLOW_COPY_AND_ASSIGN(Cronet_RequestFinishedInfoListenerStub);
};
Cronet_RequestFinishedInfoListenerPtr
Cronet_RequestFinishedInfoListener_CreateWith(
- Cronet_RequestFinishedInfoListener_InitWithParamsFunc InitWithParamsFunc,
Cronet_RequestFinishedInfoListener_OnRequestFinishedFunc
- OnRequestFinishedFunc,
- Cronet_RequestFinishedInfoListener_GetExecutorFunc GetExecutorFunc) {
- return new Cronet_RequestFinishedInfoListenerStub(
- InitWithParamsFunc, OnRequestFinishedFunc, GetExecutorFunc);
+ OnRequestFinishedFunc) {
+ return new Cronet_RequestFinishedInfoListenerStub(OnRequestFinishedFunc);
}
diff --git a/components/cronet/native/generated/cronet.idl_impl_interface.h b/components/cronet/native/generated/cronet.idl_impl_interface.h
index 33294a53..38d7f901 100644
--- a/components/cronet/native/generated/cronet.idl_impl_interface.h
+++ b/components/cronet/native/generated/cronet.idl_impl_interface.h
@@ -234,10 +234,8 @@
}
Cronet_ClientContext client_context() const { return client_context_; }
- virtual Cronet_RESULT InitWithParams(Cronet_ExecutorPtr executor) = 0;
virtual void OnRequestFinished(
Cronet_RequestFinishedInfoPtr request_info) = 0;
- virtual Cronet_ExecutorPtr GetExecutor() = 0;
private:
Cronet_ClientContext client_context_ = nullptr;
diff --git a/components/cronet/native/generated/cronet.idl_impl_interface_unittest.cc b/components/cronet/native/generated/cronet.idl_impl_interface_unittest.cc
index 3287b6f8..7c96c97e 100644
--- a/components/cronet/native/generated/cronet.idl_impl_interface_unittest.cc
+++ b/components/cronet/native/generated/cronet.idl_impl_interface_unittest.cc
@@ -770,9 +770,7 @@
~Cronet_RequestFinishedInfoListenerTest() override = default;
public:
- bool InitWithParams_called_ = false;
bool OnRequestFinished_called_ = false;
- bool GetExecutor_called_ = false;
private:
DISALLOW_COPY_AND_ASSIGN(Cronet_RequestFinishedInfoListenerTest);
@@ -780,19 +778,6 @@
namespace {
// Implementation of Cronet_RequestFinishedInfoListener methods for testing.
-Cronet_RESULT TestCronet_RequestFinishedInfoListener_InitWithParams(
- Cronet_RequestFinishedInfoListenerPtr self,
- Cronet_ExecutorPtr executor) {
- CHECK(self);
- Cronet_ClientContext client_context =
- Cronet_RequestFinishedInfoListener_GetClientContext(self);
- auto* test =
- static_cast<Cronet_RequestFinishedInfoListenerTest*>(client_context);
- CHECK(test);
- test->InitWithParams_called_ = true;
-
- return static_cast<Cronet_RESULT>(0);
-}
void TestCronet_RequestFinishedInfoListener_OnRequestFinished(
Cronet_RequestFinishedInfoListenerPtr self,
Cronet_RequestFinishedInfoPtr request_info) {
@@ -804,18 +789,6 @@
CHECK(test);
test->OnRequestFinished_called_ = true;
}
-Cronet_ExecutorPtr TestCronet_RequestFinishedInfoListener_GetExecutor(
- Cronet_RequestFinishedInfoListenerPtr self) {
- CHECK(self);
- Cronet_ClientContext client_context =
- Cronet_RequestFinishedInfoListener_GetClientContext(self);
- auto* test =
- static_cast<Cronet_RequestFinishedInfoListenerTest*>(client_context);
- CHECK(test);
- test->GetExecutor_called_ = true;
-
- return static_cast<Cronet_ExecutorPtr>(0);
-}
} // namespace
// Test that Cronet_RequestFinishedInfoListener stub forwards function calls as
@@ -823,15 +796,10 @@
TEST_F(Cronet_RequestFinishedInfoListenerTest, TestCreate) {
Cronet_RequestFinishedInfoListenerPtr test =
Cronet_RequestFinishedInfoListener_CreateWith(
- TestCronet_RequestFinishedInfoListener_InitWithParams,
- TestCronet_RequestFinishedInfoListener_OnRequestFinished,
- TestCronet_RequestFinishedInfoListener_GetExecutor);
+ TestCronet_RequestFinishedInfoListener_OnRequestFinished);
CHECK(test);
Cronet_RequestFinishedInfoListener_SetClientContext(test, this);
- CHECK(!InitWithParams_called_);
CHECK(!OnRequestFinished_called_);
- Cronet_RequestFinishedInfoListener_GetExecutor(test);
- CHECK(GetExecutor_called_);
Cronet_RequestFinishedInfoListener_Destroy(test);
}
